diff -u itop-0.1/debian/watch itop-0.1/debian/watch
--- itop-0.1/debian/watch
+++ itop-0.1/debian/watch
@@ -2 +2 @@
-http://www.hunz.org/ itop-(.*)\.tar\.bz2
+http://www.hunz.org/ itop/itop-(.*)\.tar\.bz2
diff -u itop-0.1/debian/changelog itop-0.1/debian/changelog
--- itop-0.1/debian/changelog
+++ itop-0.1/debian/changelog
@@ -1,3 +1,21 @@
+itop (0.1-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #239221):
+    - Remove debian/docs; TODO and README have no interesting content.
+    - src/config.h: increase MAX_INTS from 256 to 1024, to really
+      fix the segfault (LP: #188897)
+    - Modify Maintainer value to match the DebianMaintainerField
+      specification.
+
+ -- Nathan Handler <nathan.handler@gmail.com>  Wed, 11 Jun 2008 11:04:55 -0500
+
+itop (0.1-2) unstable; urgency=low
+
+  * Fixing debian/watch for itop upstream (Closes: #450026)
+  * Changing maintaner email
+
+ -- Jose Parrella <bureado@debian.org>  Wed, 19 Mar 2008 21:53:05 -0430
+
 itop (0.1-1ubuntu1) hardy; urgency=low
 
   [ Siegfried-Angel Gevatter Pujals (RainCT) ]
diff -u itop-0.1/debian/control itop-0.1/debian/control
--- itop-0.1/debian/control
+++ itop-0.1/debian/control
@@ -4,7 +4,8 @@
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Jose Parrella <joseparrella@cantv.net>
 Build-Depends: debhelper (>= 5)
-Standards-Version: 3.7.2.2
+Standards-Version: 3.7.3
+Homepage: http://www.hunz.org/
 
 Package: itop
 Architecture: any
@@ -17,2 +17,0 @@
- .
- Homepage: http://hunz.org