diff --git a/etc/tinyproxy.conf.in b/etc/tinyproxy.conf.in
index d268709..b807b16 100644
--- a/etc/tinyproxy.conf.in
+++ b/etc/tinyproxy.conf.in
@@ -321,5 +321,11 @@ ViaProxyName "tinyproxy"
 #
 #ReverseBaseURL "http://localhost:8888/"
 
-
+#
+# IP version supported by Tinyproxy
+# ipv4 : ignore IPv6 addresses in DNS response
+# ipv6 : ignore IPv4 addresses in DNS response
+# any  : accept both IPv4 and IPv6 addresses in DNS response
+#
+IPversion any
 
diff --git a/src/conf-tokens.c b/src/conf-tokens.c
index 2a1ddbe..2b8befe 100644
--- a/src/conf-tokens.c
+++ b/src/conf-tokens.c
@@ -58,7 +58,8 @@ config_directive_find (register const char *str, register size_t len)
       {"logfile", CD_logfile},
       {"basicauth", CD_basicauth},
       {"addheader", CD_addheader},
-      {"maxrequestsperchild", CD_maxrequestsperchild}
+      {"maxrequestsperchild", CD_maxrequestsperchild},
+      {"ipversion", CD_ipversion},
     };
 
 	for(i=0;i<sizeof(wordlist)/sizeof(wordlist[0]);++i) {
diff --git a/src/conf-tokens.gperf b/src/conf-tokens.gperf
index f027a23..8edd941 100644
--- a/src/conf-tokens.gperf
+++ b/src/conf-tokens.gperf
@@ -58,5 +58,6 @@ reversemagic, CD_reversemagic
 reversepath, CD_reversepath
 upstream, CD_upstream
 loglevel, CD_loglevel
+ipversion, CD_ipversion
 %%
 
diff --git a/src/conf-tokens.h b/src/conf-tokens.h
index a6338f8..7a96c76 100644
--- a/src/conf-tokens.h
+++ b/src/conf-tokens.h
@@ -43,6 +43,7 @@ CD_reversemagic,
 CD_reversepath,
 CD_upstream,
 CD_loglevel,
+CD_ipversion
 };
 
 struct config_directive_entry { const char* name; enum config_directive value; };
diff --git a/src/conf.c b/src/conf.c
index 7f94b65..ca3e4ed 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -161,6 +161,8 @@ static HANDLE_FUNC (handle_viaproxyname);
 static HANDLE_FUNC (handle_disableviaheader);
 static HANDLE_FUNC (handle_xtinyproxy);
 
+static HANDLE_FUNC (handle_ipversion);
+
 #ifdef UPSTREAM_SUPPORT
 static HANDLE_FUNC (handle_upstream);
 #endif
@@ -254,7 +256,8 @@ struct {
 #endif
         /* loglevel */
         STDCONF (loglevel, "(critical|error|warning|notice|connect|info)",
-                 handle_loglevel)
+                 handle_loglevel),
+        STDCONF (ipversion, "(ipv4|ipv6|any)", handle_ipversion)
 };
 
 const unsigned int ndirectives = sizeof (directives) / sizeof (directives[0]);
@@ -932,6 +935,34 @@ static HANDLE_FUNC (handle_loglevel)
         return -1;
 }
 
+struct ip_version_s {
+        const char *string;
+        enum ip_version_e ipversion;
+};
+static struct ip_version_s ip_version[] = {
+        {"ipv4", IPv4_Only},
+        {"ipv6", IPv6_Only},
+        {"any", IP_Any}
+};
+static HANDLE_FUNC (handle_ipversion)
+{
+        static const unsigned int nips =
+            sizeof (ip_version) / sizeof (ip_version[0]);
+        unsigned int i;
+        char *arg = get_string_arg (line, &match[2]);
+        for (i = 0; i != nips; ++i) {
+                if (!strcasecmp (arg, ip_version[i].string)) {
+                        conf->ipversion = ip_version[i].ipversion;
+                        safefree (arg);
+                        return 0;
+                }
+        }
+
+        safefree (arg);
+
+        return -1;
+}
+
 static HANDLE_FUNC (handle_basicauth)
 {
         char *user, *pass;
diff --git a/src/conf.h b/src/conf.h
index 0a0f06f..9d37afd 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -34,6 +34,12 @@ typedef struct {
         char *value;
 } http_header_t;
 
+enum ip_version_e {
+        IPv4_Only = 0,
+        IPv6_Only,
+        IP_Any
+};
+
 /*
  * Hold all the configuration time information.
  */
@@ -68,6 +74,7 @@ struct config_s {
         unsigned int idletimeout;
         sblist *bind_addrs;
         unsigned int bindsame;
+        enum ip_version_e ipversion;
 
         /*
          * The configured name to use in the HTTP "Via" header field.
diff --git a/src/sock.c b/src/sock.c
index b3b0920..e2628b9 100644
--- a/src/sock.c
+++ b/src/sock.c
@@ -146,7 +146,14 @@ int opensock (const char *host, int port, const char *bind_to)
                     "opensock: opening connection to %s:%d", host, port);
 
         memset (&hints, 0, sizeof (struct addrinfo));
-        hints.ai_family = AF_UNSPEC;
+        log_message(LOG_INFO, "opensock: ipversion: %d", config->ipversion);
+        if (config->ipversion == IPv4_Only) {
+                hints.ai_family = AF_INET;
+        } else if (config->ipversion == IPv6_Only) {
+                hints.ai_family = AF_INET6;
+        } else {
+                hints.ai_family = AF_UNSPEC;
+        }
         hints.ai_socktype = SOCK_STREAM;
 
         snprintf (portstr, sizeof (portstr), "%d", port);