diff --git a/res/wpa.conf b/res/wpa.conf
index ae11823..27c8bbb 100644
--- a/res/wpa.conf
+++ b/res/wpa.conf
@@ -30,6 +30,7 @@ device_name=my-device
 
 # Device type for desktop systems. Usually better left untouched..
 device_type=1-0050F204-1
+driver_param=p2p_device=1
 
 # Supported config-methods:
 #     pbc: Supports Push-Button-Configuration
@@ -44,4 +45,4 @@ device_type=1-0050F204-1
 # Note that wpas supports multiple options separated by spaces. But my remote
 # devices tend to choose "keypad" then, which is annoying for testing so I just
 # list pbc here as default.
-config_methods=pbc
+config_methods=keypad display pin label pbc