diff --git a/src/tool_libinfo.c b/src/tool_libinfo.c
index 81b6680c81aead6a33942603ed33fbf16fe30708..a8ffb8f6db49b368db799b6713d362bbb9b6e984 100644
--- a/src/tool_libinfo.c
+++ b/src/tool_libinfo.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -67,6 +67,8 @@ CURLcode get_libcurl_info(void)
     { "rtsp",   CURLPROTO_RTSP   },
     { "scp",    CURLPROTO_SCP    },
     { "sftp",   CURLPROTO_SFTP   },
+    { "smb",    CURLPROTO_SMB    },
+    { "smbs",   CURLPROTO_SMBS   },
     { "smtp",   CURLPROTO_SMTP   },
     { "smtps",  CURLPROTO_SMTPS  },
     { "telnet", CURLPROTO_TELNET },
diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c
index 18da0265e97a07d025182b5f2a7fa9d9a13e2991..0e05184c3d518948c28601721364a9a41031e236 100644
--- a/src/tool_paramhlp.c
+++ b/src/tool_paramhlp.c
@@ -272,6 +272,8 @@ long proto2num(struct OperationConfig *config, long *val, const char *str)
     { "smtps", CURLPROTO_SMTPS },
     { "rtsp", CURLPROTO_RTSP },
     { "gopher", CURLPROTO_GOPHER },
+    { "smb", CURLPROTO_SMB },
+    { "smbs", CURLPROTO_SMBS },
     { NULL, 0 }
   };
 
diff --git a/src/tool_setopt.c b/src/tool_setopt.c
index 62d94a65fbf9ec4a16074a5d089c4dfd76c789cc..a53fdc835d6094d2c1db04e77df2138b69f3f84f 100644
--- a/src/tool_setopt.c
+++ b/src/tool_setopt.c
@@ -134,6 +134,8 @@ const NameValue setopt_nv_CURLPROTO[] = {
   NV(CURLPROTO_RTSP),
   NV(CURLPROTO_SCP),
   NV(CURLPROTO_SFTP),
+  NV(CURLPROTO_SMB),
+  NV(CURLPROTO_SMBS),
   NV(CURLPROTO_SMTP),
   NV(CURLPROTO_SMTPS),
   NV(CURLPROTO_TELNET),
diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 848de321b6a62a25c1caa2c5a5bfde55b5272229..6a0119db734eca7eb46186c7252cf5ab53b45919 100644
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -10,4 +10,3 @@
 836
 882
 938
-1013