diff --git a/bin/ovpn_genconfig b/bin/ovpn_genconfig
new file mode 100755
index 0000000..4b88747
--- /dev/null
+++ b/bin/ovpn_genconfig
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+#
+# Generate OpenVPN configs
+#
+
+set -ex
+
+cn=$1
+
+if [ -z "$cn" ]; then
+    echo "Common name not specified"
+    exit 1
+fi
+
+cat > "$OPENVPN/udp1194.conf" <<EOF
+server 192.168.255.128 255.255.255.128
+verb 3
+#duplicate-cn
+key $EASYRSA_PKI/private/$cn.key
+ca $EASYRSA_PKI/ca.crt
+cert $EASYRSA_PKI/issued/$cn.crt
+dh $EASYRSA_PKI/dh.pem
+tls-auth $EASYRSA_PKI/ta.key
+key-direction 0
+keepalive 10 60
+persist-key
+persist-tun
+push "dhcp-option DNS 8.8.4.4"
+push "dhcp-option DNS 8.8.8.8"
+
+proto udp
+port 1194
+dev tun1194
+status /tmp/openvpn-status-1194.log
+EOF
diff --git a/bin/ovpn_init b/bin/ovpn_init
index 27f522f..74b2a21 100755
--- a/bin/ovpn_init
+++ b/bin/ovpn_init
@@ -36,24 +36,4 @@ echo "$cn" > $OPENVPN/servername
 
 easyrsa build-server-full $cn nopass
 
-[ -f "$OPENVPN/udp1194.conf" ] || cat > "$OPENVPN/udp1194.conf" <<EOF
-server 192.168.255.128 255.255.255.128
-verb 3
-#duplicate-cn
-key $EASYRSA_PKI/private/$cn.key
-ca $EASYRSA_PKI/ca.crt
-cert $EASYRSA_PKI/issued/$cn.crt
-dh $EASYRSA_PKI/dh.pem
-tls-auth $EASYRSA_PKI/ta.key
-key-direction 0
-keepalive 10 60
-persist-key
-persist-tun
-push "dhcp-option DNS 8.8.4.4"
-push "dhcp-option DNS 8.8.8.8"
-
-proto udp
-port 1194
-dev tun1194
-status /tmp/openvpn-status-1194.log
-EOF
+ovpn_genconfig "$cn"