diff --git a/configure.ac b/configure.ac
index da73a56..a3eff4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,6 +164,7 @@ AC_PATH_TOOL([MSGCAT], [msgcat], [no])
 AC_PATH_TOOL([MSGINIT], [msginit], [no])
 AC_PATH_TOOL([MSGMERGE], [msgmerge], [no])
 AC_PATH_TOOL([MSGFMT], [msgfmt], [no])
+AC_PATH_TOOL([VALGRIND], [valgrind], [no])
 
 AC_CHECK_HEADER(libintl.h, [
 	AC_DEFINE(HAVE_LIBINTL, 1)
diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in
index ad36c9f..f279cf0 100644
--- a/src/lib3270/Makefile.in
+++ b/src/lib3270/Makefile.in
@@ -69,8 +69,10 @@ SHELL=@SHELL@
 MKDIR=@MKDIR_P@
 XGETTEXT=@XGETTEXT@
 MSGCAT=@MSGCAT@
+VALGRIND=@VALGRIND@
 
 CC=@CC@
+HOST_CC=@HOST_CC@
 LD=@CC@
 
 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ @LIBSSL_CFLAGS@
@@ -198,6 +200,41 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
 	@$(MKDIR) `dirname $@`
 	@$(LD) -shared -Wl,-soname,$(@F) $(LDFLAGS) -o $@ $^ $(LIBS)
 
+#---[ Misc Targets ]---------------------------------------------------------------------
+
+fallbacks.c: \
+	X3270.xad \
+	mkfb.c
+
+	@echo $(basename $@) ...
+	@$(MKDIR) $(BINDIR)
+	@$(HOST_CC) -g -o $(BINDIR)/mkfb@EXEEXT@ mkfb.c
+	@$(BINDIR)/mkfb@EXEEXT@ -c X3270.xad $@
+
+version.c: \
+	./mkversion.sh
+
+	@echo $(basename $@) ...
+	@chmod +x ./mkversion.sh
+	@./mkversion.sh
+
+$(BINDBG)/testprogram$(EXEEXT): \
+	$(OBJDBG)/testprogram.o \
+	$(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o)
+
+	@echo $(basename $@) ...
+	@$(MKDIR) `dirname $@`
+	@$(LD) -o $@ $^ $(LIBS)
+
+run: \
+	$(BINDBG)/testprogram$(EXEEXT)
+
+ifeq ($(VALGRIND),no)
+	@cd "$(ROOTDIR)" ; .bin/Debug/testprogram$(EXEEXT)
+else
+	@cd "$(ROOTDIR)" ; \$(VALGRIND) --leak-check=full --gen-suppressions=all $(BINDBG)/testprogram$(EXEEXT)
+endif
+
 #---[ Clean Targets]---------------------------------------------------------------------
 
 cleanDebug:
@@ -219,5 +256,10 @@ clean: \
 	cleanDebug \
 	cleanRelease
 
+	@rm -f \
+		fallbacks.c \
+		version.c
+
+
 
 
--
libgit2 0.21.2