Index: src/iodined.c
===================================================================
--- src/iodined.c	(revision e7de432088b8613ee85a7a8504e83edca07bb59d)
+++ src/iodined.c	(revision bc76b588c91c7d61d9909162439ec946d141b5c6)
@@ -449,4 +449,5 @@
 	int port;
 	int mtu;
+	int skipipconfig;
 
 	username = NULL;
@@ -457,4 +458,5 @@
 	listen_ip = INADDR_ANY;
 	port = 53;
+	skipipconfig = 0;
 
 	b32 = get_base32_encoder();
@@ -463,8 +465,11 @@
 	srand(time(NULL));
 	
-	while ((choice = getopt(argc, argv, "vfhu:t:d:m:l:p:P:")) != -1) {
+	while ((choice = getopt(argc, argv, "vsfhu:t:d:m:l:p:P:")) != -1) {
 		switch(choice) {
 		case 'v':
 			version();
+			break;
+		case 's':
+			skipipconfig = 1;
 			break;
 		case 'f':
@@ -559,6 +564,7 @@
 	if ((tun_fd = open_tun(device)) == -1)
 		goto cleanup0;
-	if (tun_setip(argv[0]) != 0 || tun_setmtu(mtu) != 0)
-		goto cleanup1;
+	if (!skipipconfig)
+		if (tun_setip(argv[0]) != 0 || tun_setmtu(mtu) != 0)
+			goto cleanup1;
 	if ((dnsd_fd = open_dns(port, listen_ip)) == -1) 
 		goto cleanup2;