diff -u c-sig-3.8/debian/emacsen-startup c-sig-3.8/debian/emacsen-startup
--- c-sig-3.8/debian/emacsen-startup
+++ c-sig-3.8/debian/emacsen-startup
@@ -2,30 +2,13 @@
-;;
-;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50c-sig.el
-;; for the Debian c-sig package
-;;
-;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
-;; Modified by Dirk Eddelbuettel <edd@debian.org>
-;; Adapted for dh-make by Jim Van Zandt <jrv@debian.org>
 
-;; The c-sig package follows the Debian/GNU Linux 'emacsen' policy and
-;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
-;; xemacs19, emacs20, xemacs20...).  The compiled code is then
-;; installed in a subdirectory of the respective site-lisp directory.
-;; We have to add this to the load-path:
-(let ((package-dir (concat "/usr/share/"
-                           (symbol-name flavor)
-                           "/site-lisp/c-sig")))
-;; If package-dir does not exist, the c-sig package must have
-;; removed but not purged, and we should skip the setup.
-  (when (file-directory-p package-dir)
-    (setq load-path (cons package-dir load-path))))
-;;    (autoload 'c-sig-mode "c-sig-mode"
-;;      "Major mode for editing c-sig files." t)
-;;    (add-to-list 'auto-mode-alist '("\\.c-sig$" . c-sig-mode))))
+(if (not (file-exists-p "/usr/share/emacs/site-lisp/c-sig"))
+    (message "Package c-sig removed but not purged.  Skipping setup.")
 
-(autoload 'add-signature "c-sig" "c-sig" t)
-(autoload 'delete-signature "c-sig" "c-sig" t)
-(autoload 'insert-signature-eref "c-sig" "c-sig" t)
-(autoload 'insert-signature-automatically "c-sig" "c-sig" t)
-(autoload 'insert-signature-randomly "c-sig" "c-sig" t)
+  (debian-pkg-add-load-path-item 
+   (concat
+    "/usr/share/" (symbol-name debian-emacs-flavor) "/site-lisp/c-sig"))
 
+  (autoload 'add-signature "c-sig" "c-sig" t)
+  (autoload 'delete-signature "c-sig" "c-sig" t)
+  (autoload 'insert-signature-eref "c-sig" "c-sig" t)
+  (autoload 'insert-signature-automatically "c-sig" "c-sig" t)
+  (autoload 'insert-signature-randomly "c-sig" "c-sig" t))
diff -u c-sig-3.8/debian/changelog c-sig-3.8/debian/changelog
--- c-sig-3.8/debian/changelog
+++ c-sig-3.8/debian/changelog
@@ -1,3 +1,10 @@
+c-sig (3.8-17) unstable; urgency=low
+
+  * debian/emacsen-startup: Rewrite to allow debian-policy. (Closes: #669321)
+  * Bump Standards-Version to 3.9.3. 
+
+ -- TANIGUCHI Takaki <takaki@debian.org>  Wed, 09 May 2012 22:37:29 +0900
+
 c-sig (3.8-16) unstable; urgency=low
 
   * debian/emacsen-script: Fixed removed autoload config.
diff -u c-sig-3.8/debian/control c-sig-3.8/debian/control
--- c-sig-3.8/debian/control
+++ c-sig-3.8/debian/control
@@ -3,7 +3,9 @@
 Priority: optional
 Maintainer: TANIGUCHI Takaki <takaki@debian.org>
 Build-Depends: debhelper (>= 7.0.0)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
+Vcs-Git: git://git.debian.org/collab-maint/c-sig.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/c-sig.git;a=summary
 Homepage: http://www.osk.3web.ne.jp/~kshibata/c-sig/
 
 Package: c-sig