diff --git a/debian/README.Debian b/debian/README.Debian
index dab48af..4f3f364 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -26,4 +26,4 @@ These additional notes from upstream:
     wmCalClock shows as a 64x64 shaped icon on your desktop under other window
     managers.
 
- -- Kevin Coyner <kevin@rustybear.com>  Mon, 04 Jun 2007 09:17:20 -0400
+ -- Kevin Coyner <kcoyner@debian.org>  Mon, 04 Jun 2007 09:17:20 -0400
diff --git a/debian/changelog b/debian/changelog
index c63f8a8..8c26fa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wmcalclock (1.25-13) unstable; urgency=low
+
+  * Added new watch file.
+  * Throughout debian/* changed references to maintainer e-mail to my new
+    address.
+
+ -- Kevin Coyner <kcoyner@debian.org>  Sun, 05 Aug 2007 12:01:35 -0400
+
 wmcalclock (1.25-12) unstable; urgency=low
 
   * New maintainer. Closes: #427133.
diff --git a/debian/control b/debian/control
index c41e7d4..083d0d5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: wmcalclock
 Section: x11
 Priority: optional
-Maintainer: Kevin Coyner <kevin@rustybear.com>
+Maintainer: Kevin Coyner <kcoyner@debian.org>
 Build-Depends: debhelper (>= 5.0), libx11-dev, libxext-dev, libxpm-dev, x-dev, dpatch
 Standards-Version: 3.7.2
 
diff --git a/debian/patches/01_manpage_patch.dpatch b/debian/patches/01_manpage_patch.dpatch
index 3b17ce4..8dbdeb9 100644
--- a/debian/patches/01_manpage_patch.dpatch
+++ b/debian/patches/01_manpage_patch.dpatch
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_manpage_patch.dpatch by Kevin Coyner <kevin@rustybear.com>
+## 01_manpage- patch.dpatch by Kevin Coyner <kcoyner@debian.org>
 ##
 ## DP: manpage-patch
 
diff --git a/debian/patches/02_30hr_patch.dpatch b/debian/patches/02_30hr_patch.dpatch
index f8ad149..67aa026 100644
--- a/debian/patches/02_30hr_patch.dpatch
+++ b/debian/patches/02_30hr_patch.dpatch
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_30hr_patch.dpatch by Kevin Coyner <kevin@rustybear.com>
+## 02_30hr_patch.dpatch by Kevin Coyner <kcoyner@debian.org>
 ##
 ## DP: 30hr-patch See Debian bug #292736
 ## DP: Original patch from Reid W. Barton
diff --git a/debian/patches/03_manapge_30hr_patch.dpatch b/debian/patches/03_manapge_30hr_patch.dpatch
index 4ce2f25..2745e33 100644
--- a/debian/patches/03_manapge_30hr_patch.dpatch
+++ b/debian/patches/03_manapge_30hr_patch.dpatch
@@ -1,5 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_manpage-30hr.dpatch by Kevin Coyner <kevin@rustybear.com>
+## 03_manpage-30hr.dpatch by Kevin Coyner <kcoyner@debian.org>
 ##
 ## DP: mapage 30hr
 
diff --git a/debian/rules b/debian/rules
index e8274d0..d13821c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp install-stamp
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) clean
 	dh_clean
 
 patch: patch-stamp
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..f081f2b
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://dockapps.org/file.php/id/9 (?:.*/)?wmCalClock-?_?([\d+\.]+|\d+)\.tar.*