diff -u sml-mode-4.0/debian/changelog sml-mode-4.0/debian/changelog
--- sml-mode-4.0/debian/changelog
+++ sml-mode-4.0/debian/changelog
@@ -1,3 +1,16 @@
+sml-mode (4.0-6ubuntu1) gutsy; urgency=low
+
+  * debian/control:
+    - Add emacs22 to Depends.
+    - Ubuntu Maintainer spec.
+  * debian/emacsen-install: Install symlinks rather than copying and
+    later removing source files.  This makes find-function work.
+  * debian/emacsen-startup: Don't add /usr/share/emacs/site-lisp/sml-mode
+    to the load-path.
+  * debian/rules: Fix lintian warning in clean-patched rule.
+
+ -- Michael W. Olson (GNU address) <mwolson@gnu.org>  Mon, 09 Jul 2007 20:54:35 -0400
+
 sml-mode (4.0-6) unstable; urgency=low
 
   * Fixed wrong Poly/ML error pattern, thanks to Ian Zimmerman.
diff -u sml-mode-4.0/debian/control sml-mode-4.0/debian/control
--- sml-mode-4.0/debian/control
+++ sml-mode-4.0/debian/control
@@ -1,14 +1,15 @@
 Source: sml-mode
 Section: editors
 Priority: optional
-Maintainer: Jens Peter Secher <jps@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jens Peter Secher <jps@debian.org>
 Build-Depends-Indep: texinfo, emacs21 | emacsen
 Build-Depends: debhelper (>= 5), dpatch
 Standards-Version: 3.7.2
 
 Package: sml-mode
 Architecture: all
-Depends: emacs21 | emacsen
+Depends: emacs22 | emacs21 | emacsen
 Enhances: sml-nj, mlton, mosml
 Description: a major Emacs mode for editing Standard ML
  This emacs mode provides syntax highlighting and automatic
diff -u sml-mode-4.0/debian/rules sml-mode-4.0/debian/rules
--- sml-mode-4.0/debian/rules
+++ sml-mode-4.0/debian/rules
@@ -20,7 +20,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean
 
 install: build
diff -u sml-mode-4.0/debian/emacsen-install sml-mode-4.0/debian/emacsen-install
--- sml-mode-4.0/debian/emacsen-install
+++ sml-mode-4.0/debian/emacsen-install
@@ -21,9 +21,9 @@
 FILES=`echo *.el`
-cp ${FILES} ${ELCDIR}
 cd ${ELCDIR}
+ln -sf ${ELDIR}/*.el .
 cat << EOF > path.el
 (setq load-path (cons "." load-path) byte-compile-warnings nil)
 EOF
 ${FLAVOR} ${FLAGS} ${FILES}
-rm -f *.el path.el
+rm -f path.el
 exit 0
diff -u sml-mode-4.0/debian/emacsen-startup sml-mode-4.0/debian/emacsen-startup
--- sml-mode-4.0/debian/emacsen-startup
+++ sml-mode-4.0/debian/emacsen-startup
@@ -12,8 +12,4 @@
     "/usr/share/" (symbol-name debian-emacs-flavor) "/site-lisp/sml-mode"))
 
-  ;; Make sure that Help can find the source code.  Has to be at the end.
-  (setq load-path
-      (nconc load-path (list "/usr/share/emacs/site-lisp/sml-mode")))
-  
   ;; Autoload sml-mode top-level functions site-wide.
   (load "sml-mode-startup"))