diff --git a/wmhdplop/Makefile.am b/wmhdplop/Makefile.am
index f015722..faccd01 100644
--- a/wmhdplop/Makefile.am
+++ b/wmhdplop/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS=wmhdplop
-noinst_PROGRAMS=@GKHDPLOP@
-EXTRA_PROGRAMS=gkhdplop.so
+gkhdplop_LTLIBRARIES=gkhdplop.la
+gkhdplopdir = $(libdir)/gkrellm2/plugins/
 dist_man_MANS = wmhdplop.1
 
 desktopdir = $(datadir)/applications
@@ -20,9 +20,9 @@ GTK2_LIBS = @GTK2_LIBS@
 
 LIBTOOLSUX_GKHDPLOP_SRC=wmhdplop.c util.c util.h procstat.c procstat.h devnames.c devnames.h global.h dockapp_imlib2.c dockapp_imlib2.h gkrellm_hdplop.c
 
-gkhdplop_so_SOURCES=$(LIBTOOLSUX_GKHDPLOP_SRC)
-gkhdplop_so_CFLAGS=-DGKRELLM -fPIC $(GTK2_CFLAGS) $(IMLIB2_CFLAGS)
-gkhdplop_so_LDADD=$(IMLIB2_LIBS) -lm
-gkhdplop_so_LDFLAGS=-shared
+gkhdplop_la_SOURCES=$(LIBTOOLSUX_GKHDPLOP_SRC)
+gkhdplop_la_CFLAGS=-DGKRELLM $(GTK2_CFLAGS) $(IMLIB2_CFLAGS)
+gkhdplop_la_LDFLAGS=-module -avoid-version
+gkhdplop_la_LIBADD=$(IMLIB2_LIBS) -lm
 
 all: @GKHDPLOP@
diff --git a/wmhdplop/configure.ac b/wmhdplop/configure.ac
index 5253138..87a583b 100644
--- a/wmhdplop/configure.ac
+++ b/wmhdplop/configure.ac
@@ -70,7 +70,7 @@ else
      echo -e "${YELLOW}gkrellm2/gkrellm.h header not found or unusable${RESET}... cannot build gkhdplop.so"
      build_gkhdplop="no"
   else
-    GKHDPLOP="gkhdplop.so"
+    GKHDPLOP="gkhdplop.la"
   fi
   CPPFLAGS="$SAVECPPFLAGS"
 fi