diff --git a/Makefile.in b/Makefile.in
index 59624a0..62cb801 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,20 +65,26 @@ MSGCAT=@MSGCAT@
 #---[ Release Targets ]------------------------------------------------------------------
 
 all: \
-	$(BINRLS)/ipcserver@DLLEXT@ \
-	$(BINRLS)/libipc3270@LIBEXT@ \
+	server \
+	client \
 	locale/$(GETTEXT_PACKAGE).pot
 
-plugin: \
+server: \
 	$(BINRLS)/ipcserver@DLLEXT@
 
-library: \
+client: \
 	$(BINRLS)/libipc3270@LIBEXT@
 
-$(BINRLS)/ipcserver@DLLEXT@:
+$(BINRLS)/ipcserver@DLLEXT@: \
+	server/* \
+	Makefile
+
 	@$(MAKE) -C server $@	
 
-$(BINRLS)/libipc3270@LIBEXT@:
+$(BINRLS)/libipc3270@LIBEXT@: \
+	client/* \
+	Makefile
+
 	@$(MAKE) -C client $@	
 
 locale/$(GETTEXT_PACKAGE).pot:
@@ -97,38 +103,23 @@ locale/$(GETTEXT_PACKAGE).pot:
 #---[ Install Targets ]------------------------------------------------------------------
 
 install: \
-	install-plugin \
-	install-locale \
-	$(foreach CLIENT_TARGET, $(CLIENT_TARGETS), install-$(CLIENT_TARGET))
+	install-server \
+	install-client \
+	install-locale
 
 install-locale: \
 	locale/$(LIBNAME).pot
 	@$(MAKE) -C locale DESTDIR=$(DESTDIR) install
 
-install-plugin:
-	@$(MAKE) -C server DESTDIR=$(DESTDIR) install
-
-install-linux-lib:
-	@$(MAKE) -C client DESTDIR=$(DESTDIR) install-linux-lib
-
-install-static:
-	@$(MAKE) -C client DESTDIR=$(DESTDIR) install-static
+install-server: \
+	server
 
-install-devel: \
-	locale/$(LIBNAME).pot
-
-	@$(MAKE) -C client DESTDIR=$(DESTDIR) install-devel
-
-	# Install translation files
-	@$(MKDIR) \
-		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot
+	@$(MAKE) -C server DESTDIR=$(DESTDIR) install
 
-	@$(INSTALL_DATA) \
-		locale/$(LIBNAME).pot \
-		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot
+install-client: \
+	client
 
-install-windows-lib:
-	@$(MAKE) -C client DESTDIR=$(DESTDIR) install-windows-lib
+	@$(MAKE) -C client DESTDIR=$(DESTDIR) install
 
 doc:
 	@$(DOXYGEN) ./doxygen/doxyfile
diff --git a/client/Makefile.in b/client/Makefile.in
index c33371b..e1fcb81 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -46,8 +46,7 @@ DYNAMIC_SOURCES= \
 TEST_SOURCES= \
 	$(wildcard src/testprogram/*.cc)
 
-TARGETS= \
-	@CLIENT_TARGETS@
+CLIENT_MODULES=library static
 
 #---[ Tools ]----------------------------------------------------------------------------
 
@@ -201,12 +200,15 @@ $(POTDIR)/$(MODULE_NAME)/%.pot: \
 #---[ Release Targets ]------------------------------------------------------------------
 
 all: \
-	$(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ \
-	$(BINRLS)/lib$(MODULE_NAME).static.a \
-	$(POTDIR)/$(MODULE_NAME).pot
+	$(foreach MODULE, $(CLIENT_MODULES), $(MODULE))
 
 Release: \
-	$(BINRLS)/lib$(MODULE_NAME)@LIBEXT@ \
+	$(foreach MODULE, $(CLIENT_MODULES), $(MODULE))
+
+library: \
+	$(BINRLS)/lib$(MODULE_NAME)@LIBEXT@
+
+static: \
 	$(BINRLS)/lib$(MODULE_NAME).static.a
 
 $(BINRLS)/lib$(MODULE_NAME)@LIBEXT@: \
@@ -235,9 +237,13 @@ $(BINRLS)/lib$(MODULE_NAME).static.a: \
 #---[ Install Targets ]------------------------------------------------------------------
 
 install: \
-       $(foreach TARGET, $(TARGETS), install-$(TARGET))
+	$(foreach MODULE, $(CLIENT_MODULES), install-$(MODULE)) \
+	install-devel	
+
+install-library: \
+	install-@OSNAME@-library
 
-install-linux-lib: \
+install-linux-library: \
 	$(BINRLS)/lib$(MODULE_NAME)@LIBEXT@
 
 	@$(MKDIR) \
@@ -251,7 +257,7 @@ install-linux-lib: \
 		lib$(MODULE_NAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
 		$(DESTDIR)$(libdir)/lib$(MODULE_NAME)@DLLEXT@
 
-install-windows-lib: \
+install-windows-library: \
 	$(BINRLS)/lib$(MODULE_NAME)@LIBEXT@
 
 	@$(MKDIR) \
diff --git a/configure.ac b/configure.ac
index 0d64e15..5a9c950 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ dnl ---------------------------------------------------------------------------
 
 CLIENT_LDFLAGS=""
 CLIENT_LIBS=""
-CLIENT_TARGETS="devel"
+CLIENT_MODULES="library"
 
 dnl ---------------------------------------------------------------------------
 dnl Check for OS specifics
@@ -78,8 +78,6 @@ case "$host" in
 		CLIENT_LIBS="-Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic"
 		DLLEXT=".dll"
 
-		CLIENT_TARGETS="windows-lib $CLIENT_TARGETS"
-
 		app_win32_revision=$(date +%-y.%-m.%-d.%-H)
 		AC_SUBST(WIN32_VERSION,$app_win32_revision)
 
@@ -105,8 +103,6 @@ case "$host" in
 		DLLEXT=".so"
 		CLIENT_LDFLAGS="-shared"
 
-		CLIENT_TARGETS="linux-lib $CLIENT_TARGETS"
-
 		app_cv_static='no'
 
 esac
@@ -188,10 +184,10 @@ AC_ARG_ENABLE([static],
 ])
 
 if test "$app_cv_static" == "yes"; then
-	CLIENT_TARGETS="$CLIENT_TARGETS static"
+	CLIENT_MODULES="$CLIENT_MODULES static"
 fi
 
-AC_SUBST(CLIENT_TARGETS)
+AC_SUBST(CLIENT_MODULES)
 
 dnl ---------------------------------------------------------------------------
 dnl Check for libintl
--
libgit2 0.21.2