diff --git a/debian/changelog b/debian/changelog
index b42060ac..2a832cb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ byobu (4.18) unreleased; urgency=low
     usr/share/byobu/profiles/tmux, usr/share/byobu/windows/common:
     - use a BYOBU_BACKEND environment variable, to support both screen
       and tmux
+  * usr/lib/byobu/.common, usr/lib/byobu/.constants:
+    - ensure that libraries only get included once
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 29 Jun 2011 02:26:28 +0000
 
diff --git a/usr/lib/byobu/.common b/usr/lib/byobu/.common
index 1129b478..0075676a 100644
--- a/usr/lib/byobu/.common
+++ b/usr/lib/byobu/.common
@@ -18,5 +18,8 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. "${BYOBU_PREFIX}/lib/${PKG}/.shutil"
-. "${BYOBU_PREFIX}/lib/${PKG}/.constants"
+if [ -z "${BYOBU_INCLUDED_LIBS}" ]; then
+	. "${BYOBU_PREFIX}/lib/${PKG}/.shutil"
+	. "${BYOBU_PREFIX}/lib/${PKG}/.constants"
+	BYOBU_INCLUDED_LIBS=1
+fi
diff --git a/usr/lib/byobu/.constants b/usr/lib/byobu/.constants
index 34ff9b9a..92c5707b 100755
--- a/usr/lib/byobu/.constants
+++ b/usr/lib/byobu/.constants
@@ -47,7 +47,7 @@ fi
 # Some users build and install byobu themselves, rather than from a distro
 [ -n "$BYOBU_PREFIX" ] || BYOBU_PREFIX="/usr"
 
-# UTF8 support in the hardstatus is coming one day in screen
+# UTF8 support in the hardstatus is coming one day in Screen
 if [ "$UTF8" = "1" ]; then
 	ICON_C="℃"
 	ICON_F="℉"