diff --git a/Makefile b/Makefile
index dfb9702baa..438559e977 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PKG_NAME=docker-dev
+PKG_NAME=dotcloud-docker
 PKG_ARCH=amd64
 PKG_VERSION=1
 ROOT_PATH:=$(PWD)
@@ -25,7 +25,7 @@ install:
 	mkdir -p $(DESTDIR)/$(INSDIR)
 	mkdir -p $(DESTDIR)/etc/init
 	install -m 0755 bin/docker $(DESTDIR)/$(INSDIR)
-	install -o root -m 0755 etc/docker-dev.upstart $(DESTDIR)/etc/init/docker-dev.conf
+	install -o root -m 0755 etc/docker.upstart $(DESTDIR)/etc/init/docker.conf
 
 $(BUILD_SRC): cleanup
 	# Copy ourselves into $BUILD_SRC to comply with unusual golang constraints
diff --git a/deb/debian/changelog b/deb/debian/changelog
index 552a0868f5..76cc04bee2 100644
--- a/deb/debian/changelog
+++ b/deb/debian/changelog
@@ -1,5 +1,5 @@
-docker-dev (1) precise; urgency=low
+dotcloud-docker (1) precise; urgency=low
 
   * Initial release
 
- -- dotCloud <noise+ppa@dotcloud.com>  Mon, 14 Mar 2013 03:26:21 -0700
+ -- dotCloud <ops@dotcloud.com>  Mon, 14 Mar 2013 04:43:21 -0700
diff --git a/deb/debian/control b/deb/debian/control
index 420850c552..35a842df1e 100644
--- a/deb/debian/control
+++ b/deb/debian/control
@@ -1,4 +1,4 @@
-Source: docker-dev
+Source: dotcloud-docker
 Section: misc
 Priority: extra
 Homepage: https://github.com/dotcloud/docker
@@ -7,12 +7,12 @@ Build-Depends: debhelper (>= 8.0.0), pkg-config, git, golang, libsqlite3-dev
 Vcs-Git: https://github.com/dotcloud/docker.git
 Standards-Version: 3.9.2
 
-Package: docker-dev
+Package: dotcloud-docker
 Architecture: amd64
-Provides: docker-dev
+Provides: dotcloud-docker
 Depends: lxc, wget, bsdtar, curl, sqlite3
-Description: Docker
-    Docker is a process manager with superpowers.
+Conflicts: docker
+Description: A process manager with superpowers
     It encapsulates heterogeneous payloads in Standard Containers, and runs
     them on any server with strong guarantees of isolation and repeatability.
     Is is a great building block for automating distributed systems:
diff --git a/deb/debian/copyright b/deb/debian/copyright
index 0ef85edfb0..6f3a66bbce 100644
--- a/deb/debian/copyright
+++ b/deb/debian/copyright
@@ -1,6 +1,7 @@
 Format: http://dep.debian.net/deps/dep5
-Upstream-Name: docker-dev
+Upstream-Name: dotcloud-docker
 Source: https://github.com/dotcloud/docker
+
 Files: *
 Copyright: 2012 DotCloud Inc (opensource@dotcloud.com)
 License: Apache License Version 2.0
diff --git a/deb/etc/docker-dev.upstart b/deb/etc/docker.upstart
similarity index 100%
rename from deb/etc/docker-dev.upstart
rename to deb/etc/docker.upstart