diff --git a/net/s3cmd/Portfile b/net/s3cmd/Portfile
index c7510896243b0..3b5f1f98c25aa 100644
--- a/net/s3cmd/Portfile
+++ b/net/s3cmd/Portfile
@@ -2,10 +2,9 @@
 
 PortSystem          1.0
 PortGroup           python 1.0
+PortGroup           github 1.0
 
 name                s3cmd
-version             1.6.1
-revision            1
 categories          net
 license             GPL-2
 maintainers         nomaintainer
@@ -18,21 +17,20 @@ long_description    S3cmd lets you copy files from/to Amazon S3 \
                     of Amazon's CloudFront content delivery network.
 
 homepage            http://s3tools.org/s3cmd
-master_sites        sourceforge:s3tools
 
-checksums           rmd160  33ab4c5a85b80e7563ad0d35f9dba11641373417 \
-                    sha256  4675794f84d8744ee3d35873d180f41c7b2116895ccbe2738a9bc552e1cf214e
+github.setup        s3tools s3cmd 2.1.0 v
+revision            0
+
+checksums           rmd160  4baa9f6ab2b469d94fd40eee3ea82f7d495a300f \
+                    sha256  71d05b14cd834014f6b79650f89072a818746b2583c886d570637c8331780e31 \
+                    size    450117
 
 platforms           darwin
 supported_archs     noarch
 
-python.default_version  27
+python.default_version  38
 
-depends_build-append    port:py27-setuptools
-depends_run-append      port:py27-dateutil \
-                        port:py27-magic \
-                        path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
+depends_build-append    port:py${python.default_version}-setuptools
+depends_run-append      path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
 
-livecheck.type      regex
-livecheck.url       http://sourceforge.net/projects/s3tools/files/s3cmd/
-livecheck.regex     /s3cmd/(\\d\\.\\d\\.\\d(?:\\.\\d)*)/
+github.livecheck.regex  {([0-9.]+)}