diff --git a/config.yaml b/config.yaml
index 4e6440c09..8f266117c 100644
--- a/config.yaml
+++ b/config.yaml
@@ -118,3 +118,5 @@ beef:
                 enable: false
         ipec:
             enable: true
+        dns:
+            enable: true
diff --git a/extensions/dns/config.yaml b/extensions/dns/config.yaml
new file mode 100644
index 000000000..91590d06b
--- /dev/null
+++ b/extensions/dns/config.yaml
@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2006-2013 Wade Alcorn - wade@bindshell.net
+# Browser Exploitation Framework (BeEF) - http://beefproject.com
+# See the file 'doc/COPYING' for copying permission
+#
+beef:
+    extension:
+        dns:
+            enable: true
+            name: 'DNS Server'
+            authors: ['soh_cah_toa']
+            address: '127.0.0.1'
+            port: 5300
diff --git a/extensions/dns/extension.rb b/extensions/dns/extension.rb
new file mode 100644
index 000000000..fc0e5d0e8
--- /dev/null
+++ b/extensions/dns/extension.rb
@@ -0,0 +1,19 @@
+#
+# Copyright (c) 2006-2013 Wade Alcorn - wade@bindshell.net
+# Browser Exploitation Framework (BeEF) - http://beefproject.com
+# See the file 'doc/COPYING' for copying permission
+#
+module BeEF
+module Extension
+module DNS
+
+  extend BeEF::API::Extension
+
+  @short_name  = 'dns'
+  @full_name   = 'DNS Server'
+  @description = 'A configurable DNS nameserver for performing DNS spoofing, ' \
+                 'hijacking, and other related attacks against hooked zombies'
+  
+end
+end
+end