diff --git a/Portfile b/Portfile
index 53c9c44..d761e08 100644
--- a/Portfile
+++ b/Portfile
@@ -5,21 +5,21 @@ PortSystem 1.0
 name                    python26
 version                 2.6
 revision                1
-set major               2
-set branch              2.6
+set major               [lindex [split $version .] 0]
+set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              lang
 platforms               darwin
-maintainers             nomaintainer
+maintainers             blb
 
 description             An interpreted, object-oriented programming language
 long_description        Python is an interpreted, interactive, object-oriented \
                         programming language.
 
-homepage                http://www.python.org/
+homepage                http://www.python.org
 master_sites            ${homepage}/ftp/python/${version}/ \
-                        ftp://ftp.python.org/pub/python/${version}/ \
-                        ftp://ftp.fastorama.com/mirrors/ftp.python.org/pub/python/${version}/ \
-                        ftp://ftp.python.jp/pub/python/${version}/
+                        ftp://ftp.python.org/pub/python/${version}/
+# ftp.python.jp works, but no 2.6 as of 2008-10-05
+#                        ftp://ftp.python.jp/ftp.python.org/python/${version}/
 
 distname                Python-${version}
 extract.suffix          .tgz
@@ -46,24 +46,16 @@ use_parallel_build      no
 post-patch {
    reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py
    reinplace "s|/Applications/MacPython|/Applications/MacPorts/MacPython|g" \
-      Mac/Makefile.in Mac/IDLE/Makefile.in \
-      Mac/IDLE/Makefile.in Mac/Tools/Doc/setup.py \
-      Mac/PythonLauncher/Makefile.in \
-      Mac/BuildScript/build-installer.py
+      ${worksrcpath}/Mac/Makefile.in ${worksrcpath}/Mac/IDLE/Makefile.in \
+      ${worksrcpath}/Mac/Tools/Doc/setup.py \
+      ${worksrcpath}/Mac/PythonLauncher/Makefile.in \
+      ${worksrcpath}/Mac/BuildScript/build-installer.py
    reinplace "s|xargs -0 rm -r|xargs -0 rm -rf|g" \
-      Mac/PythonLauncher/Makefile.in
+      ${worksrcpath}/Mac/PythonLauncher/Makefile.in
 }
 
 build.target            all libpython${branch}.dylib
 
-# TODO: From python24, do we still need this?
-# Workaround for case-sensitive file systems
-post-build {
-    if { ![file exists ${worksrcpath}/python.exe] } {
-        ln -s python ${worksrcpath}/python.exe
-    }
-}
-
 test.run                yes
 test.target             test
 
@@ -98,7 +90,7 @@ post-destroot {
 
    # install select file for python_select
    xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
-   xinstall -m 644 ${filespath}/python[string map {. {}} ${branch}] ${destroot}${prefix}/etc/select/python/
+   xinstall -m 644 ${filespath}/${name} ${destroot}${prefix}/etc/select/python/
 }
 
 post-activate {
@@ -110,12 +102,14 @@ post-activate {
 platform darwin 7 {
    # there is no SystemStubs on 10.3
    post-patch {
-      reinplace "s|-lSystemStubs||g" configure configure.in
+      reinplace "s|-lSystemStubs||g" ${worksrcpath}/configure \
+         ${worksrcpath}/configure.in
    }
    post-configure {
-      reinplace "s|-lSystemStubs||g" Makefile.pre.in Makefile.pre Makefile
+      reinplace "s|-lSystemStubs||g" ${worksrcpath}/Makefile.pre.in \
+         ${worksrcpath}/Makefile.pre ${worksrcpath}/Makefile
    }
-   # To avoid GCC incompatibility issue. See http://nxg.me.uk/note/2004/restFP/ (by ebgssth@gmail.com, ticket #13322)
+   # To avoid GCC incompatibility issue. See http://nxg.me.uk/note/2004/restFP/ (by ebgssth at gmail.com, ticket #13322)
    configure.ldflags-append   "-lcc_dynamic"
 }