diff --git a/Gomfile b/Gomfile
index f21cb86c..5301529e 100644
--- a/Gomfile
+++ b/Gomfile
@@ -4,8 +4,9 @@ gom 'code.google.com/p/gographviz', :commit => '454bc64fdfa2'
 gom 'code.google.com/p/mxk/go1/flowcontrol', :commit => '5ff2502e2556'
 gom 'code.google.com/p/snappy-go/snappy', :commit => '12e4b4183793'
 gom 'github.com/cheggaaa/pb', :commit => '74be7a1388046f374ac36e93d46f5d56e856f827'
+gom 'github.com/vaughan0/go-ini', :commit => 'a98ad7ee00ec53921f08832bc06ecf7fd600e6a1'
 gom 'github.com/mattn/go-shellwords', :commit => 'c7ca6f94add751566a61cf2199e1de78d4c3eee4'
-gom 'github.com/mitchellh/goamz/s3', :commit => '55f224c07975fddef9d2116600c664e30df3d594'
+gom 'github.com/mitchellh/goamz/s3', :commit => 'e7664b32019f31fd1bdf33f9e85f28722f700405'
 gom 'github.com/mkrautz/goar', :commit => '36eb5f3452b1283a211fa35bc00c646fd0db5c4b'
 gom 'github.com/smira/commander', :commit => 'f408b00e68d5d6e21b9f18bd310978dafc604e47'
 gom 'github.com/smira/flag', :commit => '357ed3e599ffcbd4aeaa828e1d10da2df3ea5107'
diff --git a/system/t06_publish/s3.py b/system/t06_publish/s3.py
index e244217f..cdb202c9 100644
--- a/system/t06_publish/s3.py
+++ b/system/t06_publish/s3.py
@@ -130,30 +130,29 @@ class S3Publish4Test(S3Test):
     runCmd = "aptly publish list"
 
 
-# Breaks, as we need a fix: https://github.com/mitchellh/goamz/pull/116
-# class S3Publish5Test(S3Test):
-#     """
-#     publish to S3: publish drop - component cleanup
-#     """
-#     fixtureCmds = [
-#         "aptly repo create local1",
-#         "aptly repo create local2",
-#         "aptly repo add local1 ${files}/libboost-program-options-dev_1.49.0.1_i386.deb",
-#         "aptly repo add local2 ${files}",
-#         "aptly publish repo -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec -distribution=sq1 local1 s3:test1:",
-#         "aptly publish repo -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec -distribution=sq2 local2 s3:test1:",
-#     ]
-#     runCmd = "aptly publish drop sq2 s3:test1:"
+class S3Publish5Test(S3Test):
+    """
+    publish to S3: publish drop - component cleanup
+    """
+    fixtureCmds = [
+        "aptly repo create local1",
+        "aptly repo create local2",
+        "aptly repo add local1 ${files}/libboost-program-options-dev_1.49.0.1_i386.deb",
+        "aptly repo add local2 ${files}",
+        "aptly publish repo -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec -distribution=sq1 local1 s3:test1:",
+        "aptly publish repo -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec -distribution=sq2 local2 s3:test1:",
+    ]
+    runCmd = "aptly publish drop sq2 s3:test1:"
 
-#     def check(self):
-#         super(S3Publish5Test, self).check()
+    def check(self):
+        super(S3Publish5Test, self).check()
 
-#         self.check_exists('public/dists/sq1')
-#         self.check_not_exists('public/dists/sq2')
-#         self.check_exists('public/pool/main/')
+        self.check_exists('public/dists/sq1')
+        self.check_not_exists('public/dists/sq2')
+        self.check_exists('public/pool/main/')
 
-#         self.check_not_exists('public/pool/main/p/pyspi/pyspi_0.6.1-1.3.dsc')
-#         self.check_not_exists('public/pool/main/p/pyspi/pyspi_0.6.1-1.3.diff.gz')
-#         self.check_not_exists('public/pool/main/p/pyspi/pyspi_0.6.1.orig.tar.gz')
-#         self.check_not_exists('public/pool/main/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc')
-#         self.check_exists('public/pool/main/b/boost-defaults/libboost-program-options-dev_1.49.0.1_i386.deb')
+        self.check_not_exists('public/pool/main/p/pyspi/pyspi_0.6.1-1.3.dsc')
+        self.check_not_exists('public/pool/main/p/pyspi/pyspi_0.6.1-1.3.diff.gz')
+        self.check_not_exists('public/pool/main/p/pyspi/pyspi_0.6.1.orig.tar.gz')
+        self.check_not_exists('public/pool/main/p/pyspi/pyspi-0.6.1-1.3.stripped.dsc')
+        self.check_exists('public/pool/main/b/boost-defaults/libboost-program-options-dev_1.49.0.1_i386.deb')