diff --git a/configure.ac b/configure.ac
index a37dc08..be8dfbd 100755
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,7 @@ AC_PROG_OBJC
 LT_PREREQ([2.2.6])
 LT_INIT(disable-static)
 
+#unused (maybe)
 PLUMA_API_VERSION=2.20
 AC_SUBST(PLUMA_API_VERSION)
 
@@ -484,9 +485,9 @@ fi
 # on win32 plugins must be able to resolve all symbols at link time
 # so we create a lib
 if test "$platform_win32" = yes; then
-	PLUMA_IMPLIB="-lpluma-$PLUMA_API_VERSION"
-	PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/pluma/libpluma-\$(PLUMA_API_VERSION).a"
-	LOADER_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/pluma/libpluma-\$(PLUMA_API_VERSION).a"
+	PLUMA_IMPLIB="-lpluma"
+	PLUGIN_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/pluma/libpluma.a"
+	LOADER_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -Wl,\$(top_builddir)/pluma/libpluma.a"
 	if test "$os_win32" = yes; then
 		PLUGIN_LIBTOOL_FLAGS="${PLUGIN_LIBTOOL_FLAGS} -mwindows"
 		LOADER_LIBTOOL_FLAGS="${LOADER_LIBTOOL_FLAGS} -mwindows"
diff --git a/data/Makefile.am b/data/Makefile.am
index da8ec7d..013e5ae 100755
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,10 +11,10 @@ schemas_DATA 	 = $(schemas_in_files:.schemas.in=.schemas)
 man_MANS = pluma.1
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = pluma-@PLUMA_API_VERSION@.pc
+pkgconfig_DATA = pluma.pc
 
-pluma-@PLUMA_API_VERSION@.pc: pluma.pc
-	cp pluma.pc pluma-@PLUMA_API_VERSION@.pc
+pluma.pc: pluma.pc
+	cp pluma.pc pluma.pc
 
 bugreportdir = $(libexecdir)/pluma
 bugreport_SCRIPTS = pluma-bugreport.sh
diff --git a/data/pluma.pc.in b/data/pluma.pc.in
index ca67324..de88a42 100755
--- a/data/pluma.pc.in
+++ b/data/pluma.pc.in
@@ -7,5 +7,5 @@ Name: pluma
 Description: pluma
 Requires: gtksourceview-2.0
 Version: @VERSION@
-Cflags: -I${includedir}/pluma-@PLUMA_API_VERSION@
+Cflags: -I${includedir}/pluma
 Libs: -L${libdir} @PLUMA_IMPLIB@
diff --git a/pluma/Makefile.am b/pluma/Makefile.am
index 1d98ac8..62e880d 100755
--- a/pluma/Makefile.am
+++ b/pluma/Makefile.am
@@ -26,7 +26,7 @@ pluma_SOURCES = \
 pluma_LDADD = libpluma.la $(PLUMA_LIBS) $(IGE_MAC_LIBS) $(EGG_SMCLIENT_LIBS)
 
 if PLATFORM_WIN32
-pluma_LDFLAGS = -Wl,--export-all-symbols -Wl,--out-implib,libpluma-$(PLUMA_API_VERSION).a
+pluma_LDFLAGS = -Wl,--export-all-symbols -Wl,--out-implib,libpluma.a
 if OS_WIN32
 pluma_LDFLAGS += -mwindows
 endif
@@ -121,7 +121,7 @@ if !ENABLE_GVFS_METADATA
 INST_H_FILES += pluma-metadata-manager.h
 endif
 
-headerdir = $(prefix)/include/pluma-@PLUMA_API_VERSION@/pluma
+headerdir = $(prefix)/include/pluma/pluma
 
 header_DATA = 				\
 	$(INST_H_FILES)
@@ -225,7 +225,7 @@ dist-hook:
 install-exec-hook:
 if PLATFORM_WIN32
 	$(mkinstalldirs) "$(DESTDIR)$(libdir)"
-	$(INSTALL_DATA) libpluma-$(PLUMA_API_VERSION).a "$(DESTDIR)$(libdir)"
+	$(INSTALL_DATA) libpluma.a "$(DESTDIR)$(libdir)"
 else
 	rm -f $(DESTDIR)$(bindir)/mate-text-editor
 	ln -s pluma $(DESTDIR)$(bindir)/mate-text-editor