diff --git a/configure.ac b/configure.ac
index 6369e0e..b328ee5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,9 +50,6 @@ XORG_DRIVER_CHECK_EXT(XKB, kbproto)
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server >=  1.18.99.2] xproto $REQUIRED_MODULES)
 
-DRIVER_NAME=joystick
-AC_SUBST([DRIVER_NAME])
-
 # -----------------------------------------------------------------------------
 #			Configuration options
 # -----------------------------------------------------------------------------
diff --git a/man/Makefile.am b/man/Makefile.am
index 057e105..4a77e2a 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -23,11 +23,11 @@
 
 drivermandir = $(DRIVER_MAN_DIR)
 
-driverman_PRE = @DRIVER_NAME@.man
+driverman_PRE = joystick.man
 
 driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
 
-EXTRA_DIST = @DRIVER_NAME@.man
+EXTRA_DIST = joystick.man
 
 CLEANFILES = $(driverman_DATA)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index c8e8b93..4f1386f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,13 +27,13 @@
 
 AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
 
-@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
-@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
-@DRIVER_NAME@_drv_ladir = @inputdir@
+joystick_drv_la_LTLIBRARIES = joystick_drv.la
+joystick_drv_la_LDFLAGS = -module -avoid-version
+joystick_drv_ladir = @inputdir@
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
-@DRIVER_NAME@_drv_la_SOURCES =  jstk.c jstk.h \
+joystick_drv_la_SOURCES =  jstk.c jstk.h \
 				jstk_axis.c jstk_axis.h \
 				jstk_key.c jstk_key.h \
 				jstk_options.c jstk_options.h \
@@ -44,16 +44,16 @@ LINUX_SRCS = backend_joystick.c backend_joystick.h
 EVDEV_SRCS = backend_evdev.c backend_evdev.h
 
 if BSD_BACKEND
-@DRIVER_NAME@_drv_la_SOURCES += $(BSD_SRCS)
-@DRIVER_NAME@_drv_la_LDFLAGS += -lusbhid
+joystick_drv_la_SOURCES += $(BSD_SRCS)
+joystick_drv_la_LDFLAGS += -lusbhid
 endif
 
 if LINUX_BACKEND
-@DRIVER_NAME@_drv_la_SOURCES += $(LINUX_SRCS)
+joystick_drv_la_SOURCES += $(LINUX_SRCS)
 endif
 
 if EVDEV_BACKEND
-@DRIVER_NAME@_drv_la_SOURCES += $(EVDEV_SRCS)
+joystick_drv_la_SOURCES += $(EVDEV_SRCS)
 endif
 
 EXTRA_DIST = $(BSD_SRCS) $(LINUX_SRCS)