diff --git a/debian/README.Debian b/debian/README.Debian
index 8c793c0..2c16b95 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,7 +1,7 @@
-wmcalclock for DEBIAN
-----------------------
-
+wmcalclock for Debian
+---------------------
 This is Debian GNU/Linux's prepackaged version of wmCalclock, a simple
 clock and calendar.
 
-Dan Nguyen <dnn@debian.org>  Fri,  9 Apr 1999 00:12:45 -0400 
+ -- Dan Nguyen <dnn@debian.org>  Fri,  9 Apr 1999 00:12:45 -0400
+
diff --git a/debian/changelog b/debian/changelog
index 4557080..dcdf336 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+wmcalclock (1.25-6) unstable; urgency=low
+
+  * Change /usr/X11R6/bin/wmCalClock to /usr/bin/wmCalClock in
+    debian/menu (closes: #92177)
+
+ -- Dan Nguyen <dnn@debian.org>  Sat, 31 Mar 2001 20:26:14 -0500
+  
+wmcalclock (1.25-5) unstable; urgency=low
+
+  * Moved the binary to /usr/bin, as specified by Policy 12.8.7
+
+ -- Dan Nguyen <dnn@debian.org>  Tue, 27 Mar 2001 18:48:27 -0500
+  
+wmcalclock (1.25-4) unstable; urgency=low
+
+  * Recompile for woody.
+
+ -- Dan Nguyen <dnn@debian.org>  Tue, 27 Mar 2001 17:05:34 -0500
+
 wmcalclock (1.25-3) unstable; urgency=low
 
   * Changed wmcalclock to wmCalClock in menu file. (closes: #54019)
diff --git a/debian/control b/debian/control
index 0836ee3..9cdbbe4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,15 @@ Source: wmcalclock
 Section: x11
 Priority: optional
 Maintainer: Dan Nguyen <dnn@debian.org>
-Standards-Version: 2.5.0
+Build-Depends: debhelper (>> 2.0.0), xlibs-dev
+Standards-Version: 3.2.1
 
 Package: wmcalclock
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: A dock.app which simply tells time and date. 
- wmCalclock is a dock app specifically written for Window Maker, but will 
- work with other window managers.  Some features include antialiased text 
- display, with the ability to choose between different fonts, and colors.  
- 12 and 24 hour time, Greenwich time, Greenwich Mean Sidereal Time, and 
+Description: A dock.app which simply tells time and date.
+ wmCalclock is a dock app specifically written for Window Maker, but will
+ work with other window managers.  Some features include antialiased text
+ display, with the ability to choose between different fonts, and colors.
+ 12 and 24 hour time, Greenwich time, Greenwich Mean Sidereal Time, and
  Local Sidereal Time.
diff --git a/debian/copyright b/debian/copyright
index 401a1ce..b40f58d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,5 @@ It was downloaded from http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
 Upstream Author(s):  Michael G. Henderson <mghenderson@lanl.gov>
 
 Copyright:
-
-This program is distributed under the GNU General Public License.  On Debian
-systems, this license can be found in the file /usr/doc/copyright/GPL.
+It's license is GPLv2, which, on debian systems, is available at:
+/usr/share/common-licenses/GPL.
diff --git a/debian/dirs b/debian/dirs
index 30dbcc2..deefac1 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1,3 @@
-usr/X11R6/bin
-usr/X11R6/man/man1
+usr/bin
+usr/man/man1
+usr/share
diff --git a/debian/menu b/debian/menu
index 63fb145..dee5747 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
 ?package(wmcalclock):needs=X11 section=Apps/Tools hints="Clocks"\
-  title="wmcalclock" command="/usr/X11R6/bin/wmCalClock"
+  title="wmcalclock" command="/usr/bin/wmCalClock"
diff --git a/debian/rules b/debian/rules
index 470b362..3befe34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,6 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
-	
 	# Add here commands to compile the package.
 	$(MAKE) 
 
@@ -36,7 +35,8 @@ install-stamp: build-stamp
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp.
-	$(MAKE) install DESTDIR=`pwd`/debian/tmp/usr/X11R6
+	$(MAKE) install DESTDIR=`pwd`/debian/tmp/usr
+	mv `pwd`/debian/tmp/usr/man `pwd`/debian/tmp/usr/share
 
 	touch install-stamp