diff -Nru txaws-0.2/debian/changelog txaws-0.2/debian/changelog
--- txaws-0.2/debian/changelog	2012-03-28 05:39:53.000000000 -0400
+++ txaws-0.2/debian/changelog	2012-04-18 14:40:08.000000000 -0400
@@ -1,3 +1,11 @@
+txaws (0.2-0ubuntu11) precise; urgency=low
+
+   * d/patches/fix-euca-group-creation.patch: Always specify IpProtocol when
+     creating a security group.
+   * d/patches/fix-s3-uri-suffix.patch: Honor suffix in S3 uri
+
+ -- Brian Thomason <brian.thomason@eucalyptus.com>  Wed, 18 Apr 2012 13:29:50 -0400
+
 txaws (0.2-0ubuntu10) precise; urgency=low
 
   * d/patches/add-ssl-cert-verification.patch: Cherry pick patch from
diff -Nru txaws-0.2/debian/patches/fix-euca-group-creation.patch txaws-0.2/debian/patches/fix-euca-group-creation.patch
--- txaws-0.2/debian/patches/fix-euca-group-creation.patch	1969-12-31 19:00:00.000000000 -0500
+++ txaws-0.2/debian/patches/fix-euca-group-creation.patch	2012-04-18 14:40:34.000000000 -0400
@@ -0,0 +1,41 @@
+From: Brian Thomason <brian.thomason@eucalyptus.com>
+Description: Always define IpProtocol when creating security group (Euca bug workaround)
+Bug: https://bugs.launchpad.net/juju/+bug/907450
+
+--- a/txaws/ec2/client.py	2012-04-18 13:19:13.045632917 -0400
++++ b/txaws/ec2/client.py	2012-04-18 13:23:03.097637233 -0400
+@@ -172,10 +172,16 @@
+         @return: A C{Deferred} that will fire with a truth value for the
+             success of the operation.
+         """
++        #Eucalyptus expects the IpProtocol to be set even when being passed
++        #just a group name and owner id.  This is a bug in Eucalyptus as the
++        #version of the ec2 API being used does not require this, but newer
++        #versions do. Working around it by explicitly setting tcp.  It should
++        #have no harmful side effects
+         if source_group_name and source_group_owner_id:
+             parameters = {
+                 "SourceSecurityGroupName": source_group_name,
+                 "SourceSecurityGroupOwnerId": source_group_owner_id,
++                "IpProtocol": 'tcp',
+                 }
+         elif ip_protocol and from_port and to_port and cidr_ip:
+             parameters = {
+--- a/txaws/ec2/tests/test_client.py	2012-04-18 14:28:20.749710731 -0400
++++ b/txaws/ec2/tests/test_client.py	2012-04-18 13:45:37.000000000 -0400
+@@ -657,6 +625,7 @@
+                 self.assertEqual(creds.access_key, "foo")
+                 self.assertEqual(creds.secret_key, "bar")
+                 self.assertEqual(other_params, {
++                    "IpProtocol": "tcp",
+                     "GroupName": "WebServers",
+                     "SourceSecurityGroupName": "AppServers",
+                     "SourceSecurityGroupOwnerId": "123456789123",
+@@ -739,6 +708,7 @@
+                 self.assertEqual(creds.access_key, "foo")
+                 self.assertEqual(creds.secret_key, "bar")
+                 self.assertEqual(other_params, {
++                    "IpProtocol": "tcp",
+                     "GroupName": "WebServers",
+                     "SourceSecurityGroupName": "AppServers",
+                     "SourceSecurityGroupOwnerId": "123456789123",
diff -Nru txaws-0.2/debian/patches/fix-s3-uri-suffix.patch txaws-0.2/debian/patches/fix-s3-uri-suffix.patch
--- txaws-0.2/debian/patches/fix-s3-uri-suffix.patch	1969-12-31 19:00:00.000000000 -0500
+++ txaws-0.2/debian/patches/fix-s3-uri-suffix.patch	2012-04-18 14:40:41.000000000 -0400
@@ -0,0 +1,28 @@
+From: Brian Thomason <brian.thomason@eucalyptus.com>
+Description: The Walrus implementation of S3 defines a suffix in its URI - Now honoring it
+Bug: https://bugs.launchpad.net/juju/+bug/907450
+
+--- a/txaws/s3/client.py	2012-04-18 13:06:38.505618762 -0400
++++ b/txaws/s3/client.py	2012-04-18 13:12:06.421624913 -0400
+@@ -48,6 +48,10 @@
+ 
+     def get_path(self):
+         path = "/"
++        if self.endpoint.path != "/":
++            path = self.endpoint.path
++        if not path.endswith("/"):
++            path = path + "/"
+         if self.bucket is not None:
+             path += self.bucket
+         if self.bucket is not None and self.object_name:
+@@ -395,6 +399,10 @@
+         Get an S3 resource path.
+         """
+         path = "/"
++        if self.endpoint.path != "/":
++            path = self.endpoint.path
++        if not path.endswith("/"):
++            path = path + "/"
+         if self.bucket is not None:
+             path += self.bucket
+         if self.bucket is not None and self.object_name:
diff -Nru txaws-0.2/debian/patches/series txaws-0.2/debian/patches/series
--- txaws-0.2/debian/patches/series	2012-03-28 01:28:57.000000000 -0400
+++ txaws-0.2/debian/patches/series	2012-04-18 14:40:00.000000000 -0400
@@ -7,3 +7,5 @@
 drop-zope-datetime.patch
 aws-status-add-appindicator.patch
 add-ssl-cert-verification.patch
+fix-euca-group-creation.patch
+fix-s3-uri-suffix.patch