diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 5c46152b2..96e98c10c 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1194,8 +1194,8 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
 	if (Pointer)
 	    foundPointer = configInput(Pointer, confInput, from);
 	if (foundPointer) {
-	    Pointer->options = xf86addNewOption(Pointer->options,
-					       xnfstrdup("CorePointer"), "on");
+	    Pointer->options = xf86AddNewOption(Pointer->options,
+					        "CorePointer", "on");
 	    servlayoutp->inputs = addDevice(servlayoutp->inputs, Pointer);
 	}
     }
@@ -1284,8 +1284,8 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
 	if (Keyboard)
 	    foundKeyboard = configInput(Keyboard, confInput, from);
 	if (foundKeyboard) {
-	    Keyboard->options = xf86addNewOption(Keyboard->options,
-						xnfstrdup("CoreKeyboard"), "on");
+	    Keyboard->options = xf86AddNewOption(Keyboard->options,
+						 "CoreKeyboard", "on");
 	    servlayoutp->inputs = addDevice(servlayoutp->inputs, Keyboard);
 	}
     }