Index: port.tcl
===================================================================
--- port.tcl	(revision 129415)
+++ port.tcl	(working copy)
@@ -687,7 +687,10 @@
             if {[string first ":" $m] >= 0} {
                 set m [regsub -- "(.*):(.*)" $m "\\2@\\1"] 
             } else {
-                set m "$m@macports.org"
+                if {![string match "openmaintainer" $m] &&
+                    ![string match "nomaintainer" $m]} {
+                    set m "$m@macports.org"
+                }
             }
         }
         lappend result $m
