diff --git a/debian/changelog b/debian/changelog
index af2b1d9..9964a6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
-mininet (2.0.0d2-0ubuntu1) quantal; urgency=low
+mininet (2.0.0~rc1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Update copyright to match upstream release
+
+ -- Bob Lantz <rlantz@cs.stanford.edu>  Sat, 17 Nov 2012 22:07:49 -0800
+
+mininet (2.0.0~d4-0ubuntu1) quantal; urgency=low
 
   * Initial release.
 
- -- Bob Lantz <rlantz@cs.stanford.edu>  Sun, 01 Jul 2012 23:19:54 +0000
-
+ -- Bob Lantz <rlantz@cs.stanford.edu>  Tue, 07 Aug 2012 14:11:27 -0700
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 45597f3..fb289dc 100644
--- a/debian/control
+++ b/debian/control
@@ -5,23 +5,24 @@ Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Bob Lantz <rlantz@cs.stanford.edu>
 Standards-Version: 3.9.3
 Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 9~),
  help2man,
  python-dev,
  python-pkg-resources,
- python-setuptools
+ python-setuptools,
+ python-networkx
 Homepage: http://openflow.org/mininet
 
 Package: mininet
 Architecture: any
 Depends:
- openvswitch-controller,
  openvswitch-switch,
  python-networkx,
  telnet,
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
+Recommends: iperf, openvswitch-controller
 Description: Process-based network emulator
  Mininet is a network emulator which uses lightweight
  virtualization to create virtual networks for rapid
diff --git a/debian/rules b/debian/rules
index f000338..e2eae1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,3 +7,6 @@ override_dh_auto_build:
 	make man
 	make mnexec
 	dh_auto_build
+
+get-orig-source:
+	uscan --force-download --rename
diff --git a/debian/watch b/debian/watch
index 9d78e15..50e164e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=filenamemangle=s/.*tarball\/(.*)/$1\.tar\.gz/ \
-https://github.com/mininet/mininet/tags .*/tarball/(\d[\d\.abd]+)
+opts=filenamemangle=s/(.*)\/archive/$1/,uversionmangle=s/([abdr].*)\.tar\.gz/~$1/ \
+https://github.com/mininet/mininet/tags .*/archive\/(\d.*\.tar\.gz)