diff --git a/prebuilt/common/xbin/openvpn-up.sh b/prebuilt/common/xbin/openvpn-up.sh
new file mode 100644
index 0000000..98bb439
--- /dev/null
+++ b/prebuilt/common/xbin/openvpn-up.sh
@@ -0,0 +1,44 @@
+#!/system/xbin/bash
+#
+# /system/xbin/openvpn-up.sh v0.2
+#
+# Philip Freeman <philip.freeman@gmail.com>
+#
+# TODO: add support for grabbing search domains ?
+#
+# Changes:
+#-- v0.2
+# - Added system logging
+# - Fixed fome path issues
+#
+
+LOG="/system/bin/log -t openvpn-up"
+SETPROP=/system/bin/setprop
+EXPR=/system/xbin/expr
+stop=0
+dns_num=1
+i=0
+
+${LOG} "Starting..."
+
+eval opt=\$foreign_option_$i
+
+while [ ${stop} -eq 0 ]; do
+  if [ "`${EXPR} substr "$opt" 1 11`" = "dhcp-option" ]; then
+    if [ "`${EXPR} substr "$opt" 13 3`" = "DNS" ]; then
+      DNS="`${EXPR} substr "$opt" 17 1024`"
+      ${LOG} "Got DNS${dns_num}: ${DNS}"
+      if [ ${dns_num} -le 2 ]; then
+	#Set it
+	${LOG} ${SETPROP} vpn.dns${dns_num} ${DNS}
+	${SETPROP} vpn.dns${dns_num} ${DNS}
+      fi
+      dns_num=$(( ${dns_num}+1 ))
+    fi
+  fi
+  i=$(( $i+1 ))
+  eval opt=\$foreign_option_$i
+  if [ "$opt" = "" ]; then
+    stop=1
+  fi
+done
diff --git a/products/common.mk b/products/common.mk
index 49e9291..502d3da 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -55,7 +55,8 @@
     vendor/cyanogen/prebuilt/common/xbin/irssi:system/xbin/irssi \
     vendor/cyanogen/prebuilt/common/xbin/lsof:system/xbin/lsof \
     vendor/cyanogen/prebuilt/common/xbin/nano:system/xbin/nano \
-    vendor/cyanogen/prebuilt/common/xbin/powertop:system/xbin/powertop
+    vendor/cyanogen/prebuilt/common/xbin/powertop:system/xbin/powertop \
+    vendor/cyanogen/prebuilt/common/xbin/openvpn-up.sh:system/xbin/openvpn-up.sh
 
 PRODUCT_COPY_FILES +=  \
     vendor/cyanogen/proprietary/RomManager.apk:system/app/RomManager.apk \