diff -u smarteiffel-1.1/debian/changelog smarteiffel-1.1/debian/changelog
--- smarteiffel-1.1/debian/changelog
+++ smarteiffel-1.1/debian/changelog
@@ -1,3 +1,10 @@
+smarteiffel (1.1-8ubuntu1) edgy; urgency=low
+
+  * Re-sync with Debian
+  * Manually merge back in Ubuntu changes. (1.1-6ubuntu1)
+
+ -- Barry deFreese <bddebian@comcast.net>  Sat,  8 Jul 2006 14:29:45 -0400
+
 smarteiffel (1.1-8) unstable; urgency=low
 
   * Adjusted doc-base (Closes: #355515).
@@ -11,6 +18,14 @@
 
  -- Daniel Baumann <daniel.baumann@panthera-systems.net>  Sat,  4 Mar 2006 12:22:00 +0100
 
+smarteiffel (1.1-6ubuntu1) dapper; urgency=low
+
+  * Fix man page error (Closes Malone: #5625)
+  * Fix /usr/lib/smarteiffel dir (Closes Malone: #3706)
+
+ -- Barry deFreese <bddebian@comcast.net>  Thu,  6 Apr 2006 18:56:37 
+-0400
+
 smarteiffel (1.1-6) unstable; urgency=high
 
   * Fixed wrong permissions in /usr/lib/smarteiffel/bin made in previous
diff -u smarteiffel-1.1/debian/manpage/smarteiffel.sh.1 smarteiffel-1.1/debian/manpage/smarteiffel.sh.1
--- smarteiffel-1.1/debian/manpage/smarteiffel.sh.1
+++ smarteiffel-1.1/debian/manpage/smarteiffel.sh.1
@@ -48,8 +48,8 @@
 is a set of programs that compile and manage programs written in the
 Eiffel language.
 When using them, the environment variable
-.B Smarteiffel
-must be set to /usr/lib/smarteiffel.
+.B SmartEiffel
+must be set to /usr/lib/smarteiffel/sys/system.se.
 A summary of options are included below.
 For a complete description, see the HTML documentation.
 .TP
diff -u smarteiffel-1.1/debian/wrapper/smarteiffel.sh smarteiffel-1.1/debian/wrapper/smarteiffel.sh
--- smarteiffel-1.1/debian/wrapper/smarteiffel.sh
+++ smarteiffel-1.1/debian/wrapper/smarteiffel.sh
@@ -3,7 +3,7 @@
 
 if [ -z $SmartEiffel ]
 then
-	export SmartEiffel=/usr/lib/smarteiffel
+	export SmartEiffel=/usr/lib/smarteiffel/sys/system.se
 	echo Setting SmartEiffel variable to $SmartEiffel
 fi