diff --git a/Makefile.in b/Makefile.in
index c3d2fce..a86cf8e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,6 +32,7 @@ PACKAGE_LEVEL=@PACKAGE_LEVEL@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_DESCRIPTION=@PACKAGE_DESCRIPTION@
 PLUGINS=@PLUGINS@
+# MODULES=3270
 
 #---[ Paths ]------------------------------------------------------------------
 
@@ -81,27 +82,26 @@ Release: \
 
 #---[ Debug Rules ]----------------------------------------------------------------------
 
-$(BINDBG)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@: \
-	modules/lib3270/* \
-	modules/lib3270/src/lib3270/* \
-	modules/lib3270/src/include/* \
-	modules/lib3270/src/include/lib3270/*
-
-	@$(MKDIR) `dirname $@`
-	@$(MAKE) -C modules/lib3270 $@
-
-$(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@: \
-	modules/libv3270/* \
-	modules/libv3270/src/v3270/* \
-	modules/libv3270/src/include/* \
-	modules/libv3270/src/include/v3270/* \
-
-	@$(MKDIR) `dirname $@`
-	@$(MAKE) -C modules/libv3270 $@
+#$(BINDBG)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@: \
+#	modules/lib3270/* \
+#	modules/lib3270/src/lib3270/* \
+#	modules/lib3270/src/include/* \
+#	modules/lib3270/src/include/lib3270/*
+#
+#	@$(MKDIR) `dirname $@`
+#	@$(MAKE) -C modules/lib3270 $@
+
+#$(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@: \
+#	modules/libv3270/* \
+#	modules/libv3270/src/v3270/* \
+#	modules/libv3270/src/include/* \
+#	modules/libv3270/src/include/v3270/* \
+#
+#	@$(MKDIR) `dirname $@`
+#	@$(MAKE) -C modules/libv3270 $@
 
 $(BINDBG)/%@EXEEXT@: \
-	$(BINDBG)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@ \
-	$(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@ \
+	$(foreach MODULE, $(MODULES), $(BINDBG)/@DLLPREFIX@$(MODULE)@DLLEXT@) \
 	src/% \
 	src/%/*
 
@@ -230,12 +230,10 @@ $(POTDIR)/%.pot: \
 #---[ Debug Targets ]--------------------------------------------------------------------
 
 Debug: \
-	$(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \
 	$(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \
 	$(foreach PLG, $(PLUGINS), $(BINDBG)/plugins/$(PLG)@DLLEXT@)
 
 run: \
-	$(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \
 	$(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
 
 	@LD_LIBRARY_PATH=$(BINDBG) $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
@@ -269,16 +267,12 @@ cleanDebug:
 
 	@rm -fr $(OBJDBG)
 	@rm -fr $(BINDBG)
-	@$(MAKE) -C modules/lib3270 $@
-	@$(MAKE) -C modules/libv3270 $@
 	@$(MAKE) -C src/pw3270 $@
 
 cleanRelease:
 
 	@rm -fr $(OBJRLS)
 	@rm -fr $(BINRLS)
-	@$(MAKE) -C modules/lib3270 $@
-	@$(MAKE) -C modules/libv3270 $@
 	@$(MAKE) -C src/pw3270 $@
 
 
diff --git a/configure.ac b/configure.ac
index 74e8a3e..7b77c9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -398,26 +398,41 @@ dnl ---------------------------------------------------------------------------
 dnl Lib3270 flags
 dnl ---------------------------------------------------------------------------
 
-AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])], [ app_cv_libname="$withval" ],[ app_cv_libname="3270" ])
+dnl AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])], [ app_cv_libname="$withval" ],[ app_cv_libname="3270" ])
 
-AC_SUBST(LIB3270_INCLUDEPATH,$ac_pwd/modules/lib3270/src/include)
-AC_SUBST(LIBV3270_INCLUDEPATH,$ac_pwd/modules/libv3270/src/include)
+PKG_CHECK_MODULES( [LIB3270], [lib3270], app_cv_3270="yes", app_cv_3270="no" )
 
-AC_SUBST(LIB3270_CFLAGS,-I$ac_pwd/modules/lib3270/src/include)
-AC_SUBST(LIB3270_LIBS,-l$app_cv_libname)
+if test "$app_cv_3270" == "yes"; then
+	AC_DEFINE(HAVE_LIB3270)
+	AC_SUBST(LIB3270_CFLAGS)
+	AC_SUBST(LIB3270_LIBS)
+else
+	AC_MSG_ERROR([ No LIB3270 devel.])
+dnl AX_SUBDIRS_CONFIGURE([modules/lib3270],[[--with-work-dir=$ac_pwd],[--with-libname=$app_cv_libname]])
+dnl AC_SUBST(LIB3270_CFLAGS,-I$ac_pwd/modules/lib3270/src/include)
+dnl AC_SUBST(LIB3270_LIBS,-l$app_cv_libname)
+dnl AC_SUBST(LIB3270_INCLUDEPATH,$ac_pwd/modules/lib3270/src/include)
+fi
 
-AC_SUBST(LIBV3270_CFLAGS,-I$ac_pwd/modules/libv3270/src/include)
-AC_SUBST(LIBV3270_LIBS,-lv$app_cv_libname)
+PKG_CHECK_MODULES( [LIBV3270], [libv3270], app_cv_v3270="yes", app_cv_v3270="no" )
 
-AC_SUBST(PW3270_CFLAGS,-I$ac_pwd/src/include)
-
-AC_SUBST(PW3270_LIBS,-l$PACKAGE_TARNAME)
+if test "$app_cv_v3270" == "yes"; then
+	AC_DEFINE(HAVE_LIBV3270)
+	AC_SUBST(LIBV3270_CFLAGS)
+	AC_SUBST(LIBV3270_LIBS)
+else
+	AC_MSG_ERROR([ No V3270 widget devel.])
+dnl AC_SUBST(LIBV3270_CFLAGS,-I$ac_pwd/modules/libv3270/src/include)
+dnl AC_SUBST(LIBV3270_LIBS,-lv$app_cv_libname)
+dnl AX_SUBDIRS_CONFIGURE([modules/libv3270],[[LIB3270_CFLAGS=-I$ac_pwd/modules/lib3270/src/include],[LIB3270_LIBS=-l$app_cv_libname],[--with-work-dir=$ac_pwd],[--with-libname=$app_cv_libname]])
+dnl AC_SUBST(LIBV3270_INCLUDEPATH,$ac_pwd/modules/libv3270/src/include)
+fi
 
-AC_DEFINE(LIB3270_NAME,$app_cv_libname)
-AC_SUBST(LIB3270_NAME,$app_cv_libname)
+dnl AC_DEFINE(LIB3270_NAME,$app_cv_libname)
+dnl AC_SUBST(LIB3270_NAME,$app_cv_libname)
 
-AX_SUBDIRS_CONFIGURE([modules/lib3270],[[--with-work-dir=$ac_pwd],[--with-libname=$app_cv_libname]])
-AX_SUBDIRS_CONFIGURE([modules/libv3270],[[LIB3270_CFLAGS=-I$ac_pwd/modules/lib3270/src/include],[LIB3270_LIBS=-l$app_cv_libname],[--with-work-dir=$ac_pwd],[--with-libname=$app_cv_libname]])
+AC_SUBST(PW3270_CFLAGS,-I$ac_pwd/src/include)
+AC_SUBST(PW3270_LIBS,-l$PACKAGE_TARNAME)
 
 dnl ---------------------------------------------------------------------------
 dnl Check for headers
--
libgit2 0.21.2