diff -urN emacs.orig/lisp/startup.el emacs/lisp/startup.el
--- emacs.orig/lisp/startup.el	2004-12-18 06:41:48.000000000 +0100
+++ emacs/lisp/startup.el	2004-12-18 06:55:54.000000000 +0100
@@ -94,6 +94,10 @@
   "Default directory to use for command line arguments.
 This is normally copied from `default-directory' when Emacs starts.")
 
+(defconst debian-emacs-flavor 'emacs-snapshot
+  "A symbol representing the particular debian flavor of emacs running.
+Something like 'emacs20, 'xemacs20, etc.")
+
 ;;; This is here, rather than in x-win.el, so that we can ignore these
 ;;; options when we are not using X.
 (defconst command-line-x-option-alist
@@ -786,8 +790,23 @@
     ;; Run the site-start library if it exists.  The point of this file is
     ;; that it is run before .emacs.  There is no point in doing this after
     ;; .emacs; that is useless.
-    (if site-run-file
-	(load site-run-file t t))
+    ;; Debianized.
+    (when site-run-file
+      (setq load-path
+            (append '("/etc/emacs-snapshot"
+                      "/etc/emacs"
+                      "/usr/local/share/emacs/cvs/site-lisp"
+                      "/usr/local/share/emacs/site-lisp"
+                      "/usr/share/emacs-snapshot/site-lisp"
+                      "/usr/share/emacs/cvs/site-lisp"
+                      "/usr/share/emacs/site-lisp")
+                    load-path))
+      ;; Load all the debian package snippets.
+      ;; It's in here because we want -q to kill it too.
+      (when (load "debian-startup" t t nil)
+        (debian-startup debian-emacs-flavor))
+      ;; Now the normal site file...
+      (load site-run-file t t nil))
 
     ;; Sites should not disable this.  Only individuals should disable
     ;; the startup message.