diff --git a/Makefile.common b/Makefile.common
index a5b3cfc759..6729a9d12b 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -771,6 +771,11 @@ ifeq ($(HAVE_LAKKA), 1)
    OBJ += misc/cpufreq/cpufreq.o
 endif
 
+ifeq ($(HAVE_WIFI), 1)
+   OBJ += wifi/drivers/nmcli.o
+   DEFINES += -DHAVE_WIFI
+endif
+
 # Audio
 
 ifeq ($(HAVE_COREAUDIO), 1)
diff --git a/configuration.c b/configuration.c
index f0750fbf25..186cd76947 100644
--- a/configuration.c
+++ b/configuration.c
@@ -213,6 +213,7 @@ enum bluetooth_driver_enum
 enum wifi_driver_enum
 {
    WIFI_CONNMANCTL          = BLUETOOTH_NULL + 1,
+   WIFI_NMCLI,
    WIFI_NULL
 };
 
@@ -1090,6 +1091,8 @@ const char *config_get_default_wifi(void)
    {
       case WIFI_CONNMANCTL:
          return "connmanctl";
+      case WIFI_NMCLI:
+         return "nmcli";
       case WIFI_NULL:
          break;
    }
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 0c5a62ce8c..b2f26bad9a 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -8867,7 +8867,7 @@ unsigned menu_displaylist_build_list(
 #ifdef HAVE_BLUETOOTH
                {MENU_ENUM_LABEL_BLUETOOTH_DRIVER,      PARSE_ONLY_STRING_OPTIONS},
 #endif
-#ifdef HAVE_LAKKA
+#if defined(HAVE_LAKKA) || defined(HAVE_WIFI)
                {MENU_ENUM_LABEL_WIFI_DRIVER,           PARSE_ONLY_STRING_OPTIONS},
 #endif
             };
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index a4e0fcd32e..1d5067ca64 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -9134,7 +9134,7 @@ static bool setting_append_list(
          }
 #endif
 
-#ifdef HAVE_LAKKA
+#if defined(HAVE_LAKKA) || defined(HAVE_WIFI)
          if (string_is_not_equal(settings->arrays.wifi_driver, "null"))
          {
             CONFIG_ACTION(
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 3330449616..c7f2d8ce72 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -193,4 +193,5 @@ HAVE_NETWORK_VIDEO=no
 HAVE_STEAM=no              # Enable Steam build
 HAVE_ODROIDGO2=no          # ODROID-GO Advance rotation support (requires librga)
 HAVE_LIBSHAKE=no           # libShake haptic feedback support
-HAVE_CHECK=no              # check support for unit tests
\ No newline at end of file
+HAVE_CHECK=no              # check support for unit tests
+HAVE_WIFI=no               # wifi driver support
diff --git a/retroarch_data.h b/retroarch_data.h
index 630770eece..f038725499 100644
--- a/retroarch_data.h
+++ b/retroarch_data.h
@@ -1089,6 +1089,9 @@ static wifi_driver_t wifi_null = {
 static const wifi_driver_t *wifi_drivers[] = {
 #ifdef HAVE_LAKKA
    &wifi_connmanctl,
+#endif
+#ifdef HAVE_WIFI
+   &wifi_nmcli,
 #endif
    &wifi_null,
    NULL,
diff --git a/wifi/drivers/nmcli.c b/wifi/drivers/nmcli.c
new file mode 100644
index 0000000000..bc779cb0dc
--- /dev/null
+++ b/wifi/drivers/nmcli.c
@@ -0,0 +1,204 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2014-2017 - Jean-André Santoni
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <time.h>
+#include <compat/strl.h>
+#include <file/file_path.h>
+#include <array/rbuf.h>
+#include <string/stdstring.h>
+#include <retro_miscellaneous.h>
+#include <configuration.h>
+#include <verbosity.h>
+#include <string.h>
+
+#include <libretro.h>
+#include "../wifi_driver.h"
+#include "../../retroarch.h"
+
+typedef struct
+{
+   wifi_network_scan_t scan;
+} nmcli_t;
+
+static void *nmcli_init(void)
+{
+   nmcli_t *nmcli = (nmcli_t*)calloc(1, sizeof(nmcli_t));
+   return nmcli;
+}
+
+static void nmcli_free(void *data)
+{
+   nmcli_t *nmcli = (nmcli_t*)data;
+
+   if (nmcli)
+   {
+      if (nmcli->scan.net_list)
+         RBUF_FREE(nmcli->scan.net_list);
+      free(nmcli);
+   }
+}
+
+static bool nmcli_start(void *data)
+{
+   (void)data;
+   return true;
+}
+
+static void nmcli_stop(void *data)
+{
+   (void)data;
+}
+
+static bool nmcli_enable(void* data, bool enabled)
+{
+   // semantics here are broken: nmcli_enable(..., false) is called
+   // on startup which is probably not what we want.
+
+//   if (enabled)
+//      pclose(popen("nmcli radio wifi on", "r"));
+//   else
+//      pclose(popen("nmcli radio wifi off", "r"));
+
+   return true;
+}
+
+static bool nmcli_connection_info(void *data, wifi_network_info_t *netinfo)
+{
+   FILE *cmd_file = NULL;
+   char line[512];
+   (void)data;
+
+   if (!netinfo)
+      return false;
+
+   cmd_file = popen("nmcli -f NAME c show --active | tail -n+2", "r");
+   if (fgets(line, sizeof(line), cmd_file))
+   {
+      strlcpy(netinfo->ssid, line, sizeof(netinfo->ssid));
+      netinfo->connected = true;
+      return true;
+   }
+
+   return false;
+}
+
+static void nmcli_scan(void *data)
+{
+   nmcli_t *nmcli = (nmcli_t*)data;
+   FILE *cmd_file = NULL;
+   char line[512];
+
+   nmcli->scan.scan_time = time(NULL);
+
+   if (nmcli->scan.net_list)
+      RBUF_FREE(nmcli->scan.net_list);
+
+   cmd_file = popen("nmcli -f IN-USE,SSID dev wifi | tail -n+2", "r");
+   while (fgets(line, 512, cmd_file))
+   {
+      wifi_network_info_t entry;
+      memset(&entry, 0, sizeof(entry));
+
+      string_trim_whitespace(line);
+      if (strlen(line) < 1)
+         continue;
+
+      if (line[0] == '*')
+      {
+         entry.connected = true;
+         line[0] = ' ';
+         string_trim_whitespace(line);
+      }
+
+      strlcpy(entry.ssid, line, sizeof(entry.ssid));
+
+      RBUF_PUSH(nmcli->scan.net_list, entry);
+   }
+   pclose(cmd_file);
+}
+
+static wifi_network_scan_t* nmcli_get_ssids(void *data)
+{
+   nmcli_t *nmcli = (nmcli_t*)data;
+   return &nmcli->scan;
+}
+
+static bool nmcli_ssid_is_online(void *data, unsigned idx)
+{
+   nmcli_t *nmcli = (nmcli_t*)data;
+
+   if (!nmcli->scan.net_list || idx >= RBUF_LEN(nmcli->scan.net_list))
+      return false;
+   return nmcli->scan.net_list[idx].connected;
+}
+
+static bool nmcli_connect_ssid(void *data, const wifi_network_info_t *netinfo)
+{
+   nmcli_t *nmcli = (nmcli_t*)data;
+   char cmd[256];
+   int ret, i;
+
+   if (!nmcli || !netinfo)
+      return false;
+
+   snprintf(cmd, sizeof(cmd), "nmcli dev wifi connect \"%s\" password \"%s\" 2>&1",
+         netinfo->ssid, netinfo->passphrase);
+   ret = pclose(popen(cmd, "r"));
+
+   if (ret == 0)
+   {
+      for (i = 0; i < RBUF_LEN(nmcli->scan.net_list); i++)
+      {
+         wifi_network_info_t* entry = &nmcli->scan.net_list[i];
+         entry->connected = strcmp(entry->ssid, netinfo->ssid) == 0;
+      }
+   }
+
+   return true;
+}
+
+static bool nmcli_disconnect_ssid(void *data, const wifi_network_info_t *netinfo)
+{
+   char cmd[256];
+   (void)data;
+
+   snprintf(cmd, sizeof(cmd), "nmcli c down \"%s\"", netinfo->ssid);
+   pclose(popen(cmd, "r"));
+
+   return true;
+}
+
+static void nmcli_tether_start_stop(void* data, bool start, char* configfile)
+{
+   (void)data;
+   (void)start;
+   (void)configfile;
+}
+
+wifi_driver_t wifi_nmcli = {
+   nmcli_init,
+   nmcli_free,
+   nmcli_start,
+   nmcli_stop,
+   nmcli_enable,
+   nmcli_connection_info,
+   nmcli_scan,
+   nmcli_get_ssids,
+   nmcli_ssid_is_online,
+   nmcli_connect_ssid,
+   nmcli_disconnect_ssid,
+   nmcli_tether_start_stop,
+   "nmcli",
+};
diff --git a/wifi/wifi_driver.h b/wifi/wifi_driver.h
index 0e06b59b89..c68e41e0b9 100644
--- a/wifi/wifi_driver.h
+++ b/wifi/wifi_driver.h
@@ -78,6 +78,7 @@ typedef struct wifi_driver
 } wifi_driver_t;
 
 extern wifi_driver_t wifi_connmanctl;
+extern wifi_driver_t wifi_nmcli;
 
 /**
  * config_get_wifi_driver_options: