diff --git a/unmaintained/dns/cache/nx/nx.factor b/extra/dns/cache/nx/nx.factor
similarity index 100%
rename from unmaintained/dns/cache/nx/nx.factor
rename to extra/dns/cache/nx/nx.factor
diff --git a/unmaintained/dns/cache/rr/rr.factor b/extra/dns/cache/rr/rr.factor
similarity index 100%
rename from unmaintained/dns/cache/rr/rr.factor
rename to extra/dns/cache/rr/rr.factor
diff --git a/unmaintained/dns/dns.factor b/extra/dns/dns.factor
similarity index 100%
rename from unmaintained/dns/dns.factor
rename to extra/dns/dns.factor
diff --git a/unmaintained/dns/forwarding/forwarding.factor b/extra/dns/forwarding/forwarding.factor
similarity index 100%
rename from unmaintained/dns/forwarding/forwarding.factor
rename to extra/dns/forwarding/forwarding.factor
diff --git a/unmaintained/dns/misc/misc.factor b/extra/dns/misc/misc.factor
similarity index 100%
rename from unmaintained/dns/misc/misc.factor
rename to extra/dns/misc/misc.factor
diff --git a/unmaintained/dns/resolver/resolver.factor b/extra/dns/resolver/resolver.factor
similarity index 100%
rename from unmaintained/dns/resolver/resolver.factor
rename to extra/dns/resolver/resolver.factor
diff --git a/unmaintained/dns/server/server.factor b/extra/dns/server/server.factor
similarity index 97%
rename from unmaintained/dns/server/server.factor
rename to extra/dns/server/server.factor
index b14d765e8d..644533d3a2 100644
--- a/unmaintained/dns/server/server.factor
+++ b/extra/dns/server/server.factor
@@ -2,7 +2,7 @@
 USING: kernel combinators sequences sets math threads namespaces continuations
        debugger io io.sockets unicode.case accessors destructors
        combinators.short-circuit combinators.smart
-       newfx fry arrays
+       fry arrays
        dns dns.util dns.misc ;
 
 IN: dns.server
@@ -64,7 +64,7 @@ SYMBOL: records-var
   [ rr->rdata-names ] map concat ;
 
 : extract-names ( message -- names )
-  [ message-query name>> ] [ extract-rdata-names ] bi prefix-on ;
+  [ message-query name>> ] [ extract-rdata-names ] bi swap prefix ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! fill-authority
@@ -99,7 +99,7 @@ DEFER: query->rrs
 : matching-cname? ( query -- rrs/f )
   [ ] [ clone CNAME >>type matching-rrs ] bi ! query rrs
   [ empty? not ]
-    [ 1st swap clone over rdata>> >>name query->rrs prefix-on ]
+    [ first swap clone over rdata>> >>name query->rrs swap prefix ]
     [ 2drop f ]
   1if ;
 
diff --git a/unmaintained/dns/stub/stub.factor b/extra/dns/stub/stub.factor
similarity index 100%
rename from unmaintained/dns/stub/stub.factor
rename to extra/dns/stub/stub.factor
diff --git a/unmaintained/dns/util/util.factor b/extra/dns/util/util.factor
similarity index 100%
rename from unmaintained/dns/util/util.factor
rename to extra/dns/util/util.factor