diff --git a/debian/changelog b/debian/changelog
index 54c019f..e313c09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,22 @@
-gf-complete (1.0.2-2) unstable; urgency=medium
+gf-complete (1.0.2-2) UNRELEASED; urgency=medium
 
+  [ Thomas Goirand ]
   * Now also building a version of the .so with SSE support.
 
+  [ James Page ]
+  * Resync with Ubuntu.
+  * Updates for Ubuntu MIR:
+    - d/control,copyright: Update upstream location to jerasure.org.
+    - d/rules: Enable parallel build.
+    - d/rules: Enable unit test execution.
+    - d/control: Add Multi-Arch: same for libgf-complete{1,-dev}.
+    - d/control: Add gf-complete-tools package, providing misc
+      tooling for using/testing gf-complete based solutions such
+      as jerasure.
+  * d/control: Bumped Standards-Version to 3.9.6, no changes.
+  * d/copyright: Switch BSD -> BSD-3-clause.
+
+
  -- Thomas Goirand <zigo@debian.org>  Tue, 11 Aug 2015 14:30:17 +0200
 
 gf-complete (1.0.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 63292b7..494e967 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,12 @@ Source: gf-complete
 Section: libs
 Priority: extra
 Maintainer: Thomas Goirand <zigo@debian.org>
-Build-Depends: autotools-dev, debhelper (>= 9), dh-autoreconf, autoconf-archive
-Standards-Version: 3.9.5
-Homepage: https://bitbucket.org/jimplank/gf-complete
+Build-Depends: autoconf-archive,
+               autotools-dev,
+               debhelper (>= 9),
+               dh-autoreconf,
+Standards-Version: 3.9.6
+Homepage: http://jerasure.org/
 Vcs-Git: git://anonscm.debian.org/openstack/gf-complete.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/gf-complete.git;a=summary
 
@@ -13,7 +16,8 @@ Section: libdevel
 Architecture: any
 Depends: libgf-complete1 (= ${binary:Version}),
          ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+Multi-Arch: same
 Description: Galois Field Arithmetic - development files
  Galois Field arithmetic forms the backbone of erasure-coded storage systems,
  most famously the Reed-Solomon erasure code. A Galois Field is defined over
@@ -30,7 +34,9 @@ Description: Galois Field Arithmetic - development files
 
 Package: libgf-complete1
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Multi-Arch: same
 Description: Galois Field Arithmetic - shared library
  Galois Field arithmetic forms the backbone of erasure-coded storage systems,
  most famously the Reed-Solomon erasure code. A Galois Field is defined over
@@ -43,3 +49,21 @@ Description: Galois Field Arithmetic - shared library
  of the field by taking that value to successively higher powers.
  .
  This package contains the shared library.
+
+Package: gf-complete-tools
+Architecture: any
+Depends: libgf-complete1 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Galois Field Arithmetic - tools
+ Galois Field arithmetic forms the backbone of erasure-coded storage systems,
+ most famously the Reed-Solomon erasure code. A Galois Field is defined over
+ w-bit words and is termed GF(2w). As such, the elements of a Galois Field are
+ the integers 0, 1, . . ., 2^w − 1. Galois Field arithmetic defines addition
+ and multiplication over these closed sets of integers in such a way that they
+ work as you would hope they would work. Specifically, every number has a
+ unique multiplicative inverse. Moreover, there is a value, typically the value
+ 2, which has the property that you can enumerate all of the non-zero elements
+ of the field by taking that value to successively higher powers.
+ .
+ This package contains miscellaneous tools for working with gf-complete.
diff --git a/debian/copyright b/debian/copyright
index e83aa9a..1f0d29f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: gf-complete
-Source: https://bitbucket.org/jimplank/gf-complete
+Source: http://jerasure.org/
 
 Files: debian/*
 Copyright: (c) 2014, Thomas Goirand <zigo@debian.org>
-License: BSD
+License: BSD-3-clause
 
 Files: *
 Copyright: (c) 2013, James S. Plank <plank@cs.utk.edu>
@@ -14,9 +14,9 @@ Copyright: (c) 2013, James S. Plank <plank@cs.utk.edu>
            (c) 2013, John A. Burnum
            (c) 2013, Adam W. Disney
            (c) 2013, Allen C. McBride
-License: BSD
+License: BSD-3-clause
 
-License: BSD
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
diff --git a/debian/gf-complete-tools.install b/debian/gf-complete-tools.install
new file mode 100644
index 0000000..4cb4bd3
--- /dev/null
+++ b/debian/gf-complete-tools.install
@@ -0,0 +1 @@
+/usr/bin/*
diff --git a/debian/rules b/debian/rules
index 3e3563a..d76ba69 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,12 @@ DEBPKGNAME      ?= $(shell dpkg-parsechangelog | grep -E ^Source: | cut -d" " -f
 GIT_TAG         ?= $(shell echo '$(VERSION)' | sed -e 's/~/_/')
 
 %:
-	dh $@  --with autoreconf
+	dh $@  --with autoreconf --parallel
 
-override_dh_auto_test:
-	#make check
-	echo "Not doing anything for now"
+override_dh_install:
+	dh_install
+	# NOTE(jamespage): Don't ship example binaries, just the actual tools
+	rm -rf $(CURDIR)/debian/gf-complete-tools/usr/bin/gf_example*
 
 override_dh_autoreconf:
 	echo "Please don't do anything!"