diff --git a/changelog.php b/changelog.php
index 4108546..b654cf3 100644
--- a/changelog.php
+++ b/changelog.php
@@ -14,6 +14,9 @@
 - -> Removed
 ! -> Note
 
+Version 6.0.1
+# Fixes to smiley dropdown for Bootstrap 3
+
 Version 6.0.0
 + Added option to hide security question for registered users
 + Added shoutbox history/archive
diff --git a/mod_shoutbox/mod_shoutbox.xml b/mod_shoutbox/mod_shoutbox.xml
index 6566688..574b1e8 100644
--- a/mod_shoutbox/mod_shoutbox.xml
+++ b/mod_shoutbox/mod_shoutbox.xml
@@ -7,7 +7,7 @@
 	<license>http://www.gnu.org/licenses/gpl-3.0.html</license> 
 	<authorEmail>admin@joomjunk.co.uk</authorEmail> 
 	<authorUrl>http://www.joomjunk.co.uk</authorUrl> 
-	<version>6.0.0</version> 
+	<version>6.0.1</version> 
 	<description>JJSHOUTBOX_DESCRIPTION</description>
 
 	<install>
diff --git a/mod_shoutbox/sql/mysql/updates/6.0.1.sql b/mod_shoutbox/sql/mysql/updates/6.0.1.sql
new file mode 100644
index 0000000..b6d7c43
--- /dev/null
+++ b/mod_shoutbox/sql/mysql/updates/6.0.1.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 6.0.1
\ No newline at end of file
diff --git a/mod_shoutbox/sql/postgresql/updates/6.0.1.sql b/mod_shoutbox/sql/postgresql/updates/6.0.1.sql
new file mode 100644
index 0000000..b6d7c43
--- /dev/null
+++ b/mod_shoutbox/sql/postgresql/updates/6.0.1.sql
@@ -0,0 +1 @@
+# Placeholder file for database changes for version 6.0.1
\ No newline at end of file
diff --git a/mod_shoutbox/tmpl/default.php b/mod_shoutbox/tmpl/default.php
index 569c50d..6ef91a8 100644
--- a/mod_shoutbox/tmpl/default.php
+++ b/mod_shoutbox/tmpl/default.php
@@ -191,11 +191,18 @@ class="<?php echo $input_txtarea; ?>"
 										<?php echo $helper->smileyshow(); ?>
 									</ul>
 								</div>
-							<?php else: ?>
+							<?php elseif ($framework == 'bootstrap') : ?>
 								<button type="button" class="<?php echo $button . $button_small; ?> dropdown-toggle" data-toggle="dropdown">
 									<img src="<?php echo JUri::root(); ?>images/mod_shoutbox/icon_e_smile.gif" alt="&#9786;" />
 								</button>
-								<ul class="dropdown-menu inline list-inline list-style">
+								<ul class="dropdown-menu inline unstyled">
+									<?php echo $helper->smileyshow(); ?>
+								</ul>
+							<?php else : ?>
+								<button type="button" class="<?php echo $button . $button_small; ?> dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+									<img src="<?php echo JUri::root(); ?>images/mod_shoutbox/icon_e_smile.gif" alt="&#9786;" />
+								</button>
+								<ul class="dropdown-menu list-inline list-unstyled">
 									<?php echo $helper->smileyshow(); ?>
 								</ul>
 							<?php endif; ?>