diff --git a/debian/changelog b/debian/changelog
index 9518cc23..8c7f68d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nova (0.3.0+really0.2.2-0ubuntu0ppa3) UNRELEASED; urgency=low
+
+  * Add a dependency on nginx from nova-objectsstore and install a
+    suitable configuration file.
+
+ -- Soren Hansen <soren@ubuntu.com>  Tue, 06 Jul 2010 13:33:44 +0200
+
 nova (0.3.0+really0.2.2-0ubuntu0ppa2) lucid; urgency=low
 
   * Added --network_path setting to nova-compute's flagfile.
diff --git a/debian/control b/debian/control
index c0b08ae8..3bfceaa2 100644
--- a/debian/control
+++ b/debian/control
@@ -91,7 +91,7 @@ Description: Nova Cloud Computing - API frontend
 
 Package: nova-objectstore
 Architecture: all
-Depends: nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
+Depends: nova-common (= ${binary:Version}), nginx, ${python:Depends}, ${misc:Depends}
 Description: Nova Cloud Computing - object store
  Nova is a cloud computing fabric controller (the main part of an IaaS
  system) built to match the popular AWS EC2 and S3 APIs. It is written in
diff --git a/debian/nova-objectstore.install b/debian/nova-objectstore.install
index 14a6dd37..590fcc01 100644
--- a/debian/nova-objectstore.install
+++ b/debian/nova-objectstore.install
@@ -1,2 +1,3 @@
 bin/nova-objectstore usr/bin
 debian/nova-objectstore.conf etc
+debian/nova-objectstore.nginx.conf etc/nginx/sites-available
diff --git a/debian/nova-objectstore.links b/debian/nova-objectstore.links
new file mode 100644
index 00000000..38e33948
--- /dev/null
+++ b/debian/nova-objectstore.links
@@ -0,0 +1 @@
+/etc/nginx/sites-available/nova-objectstore.nginx.conf /etc/nginx/sites-enabled/nova-objectstore.nginx.conf
diff --git a/debian/nova-objectstore.nginx.conf b/debian/nova-objectstore.nginx.conf
new file mode 100644
index 00000000..b6342415
--- /dev/null
+++ b/debian/nova-objectstore.nginx.conf
@@ -0,0 +1,17 @@
+server {
+  listen 3333 default;
+  server_name localhost;
+  client_max_body_size 10m;
+
+  access_log /var/log/nginx/localhost.access.log;
+
+  location ~ /_images/.+ {
+    root /var/lib/nova/images;
+    rewrite ^/_images/(.*)$ /$1 break;
+  }
+
+  location / {
+    proxy_pass http://localhost:3334/;
+  }
+}
+