diff --git a/Makefile.in b/Makefile.in
index 3042c03..f7fc7e7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,12 +49,23 @@ BINDIR=.bin
 TMPDIR=.tmp
 EXEEXT=@EXEEXT@
 DBGLIB=-L../../$(BINDIR)/Debug/lib -l3270
+RLSLIB=-L../../$(BINDIR)/Release/lib -l3270
 
 #---[ Tools ]------------------------------------------------------------------
 
 VALGRIND=@VALGRIND@
 MKDIR=@MKDIR_P@
 
+#---[ Release targets ]--------------------------------------------------------
+
+Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
+
+$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/gtk/* $(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS)
+	@$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
+
+$(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile
+	@$(MAKE) BINRLS=../../.bin/Release/lib -C src/lib3270 ../../.bin/Release/lib/@DLLPREFIX@3270@DLLEXT@
+
 #---[ Debug targets ]----------------------------------------------------------
 
 Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
@@ -84,6 +95,10 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean
 	@tar --create --gzip --verbose --directory $(TMPDIR) --exclude-vcs --file=$@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@echo $@
 
+install:
+	@make BINRLS="../../.bin/Release/lib" -C src/lib3270 install
+	@make BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/gtk install
+
 clean:
 	@rm -fr .obj
 	@rm -fr .bin
diff --git a/pw3270.cbp b/pw3270.cbp
index e76dacd..ef91e4a 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -10,9 +10,8 @@
 			<Target title="Debug">
 				<Option output=".bin/Debug/pw3270" prefix_auto="1" extension_auto="1" />
 				<Option object_output=".obj/Debug/" />
-				<Option type="1" />
+				<Option type="0" />
 				<Option compiler="gcc" />
-				<Option use_console_runner="0" />
 				<Compiler>
 					<Add option="-g" />
 					<Add option="-DDEBUG=1" />
diff --git a/src/gtk/Makefile.in b/src/gtk/Makefile.in
index 86ce75b..659fa8d 100644
--- a/src/gtk/Makefile.in
+++ b/src/gtk/Makefile.in
@@ -33,15 +33,14 @@ PACKAGE_NAME=@PACKAGE_NAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
-sbindir=@sbindir@
-libdir=@libdir@
-includedir=@includedir@
 datarootdir=@datarootdir@
 localedir=@localedir@
-docdir=@docdir@
-sysconfdir=@sysconfdir@
 
 EXEEXT=@EXEEXT@
+STRIP=@STRIP@
+INSTALL=@INSTALL@
+INSTALL_PROGRAM=@INSTALL_PROGRAM@
+INSTALL_DATA=@INSTALL_DATA@
 
 #---[ Sources ]----------------------------------------------------------------
 
@@ -65,6 +64,21 @@ LIBS=@LIBS@ @GTK_LIBS@
 
 include ../include/rules.mak
 
+#---[ Release targets ]--------------------------------------------------------
+
+Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
+	@$(STRIP) $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
+
+install: Release
+	@$(MKDIR) $(DESTDIR)$(bindir)
+	@$(INSTALL_PROGRAM) $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(DESTDIR)$(bindir)
+
+$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT):	$(foreach SRC, $(basename $(SOURCES)), $(OBJDIR)/Release/$(SRC)$(OBJEXT))
+
+	@echo $@ ...
+	@$(MKDIR) `dirname $@`
+	@$(LD) -Wl,--rpath,.bin/Debug/lib -o $@ $^ $(LIBS) $(LIB3270_LIBS)
+
 #---[ Debug targets ]----------------------------------------------------------
 
 Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
diff --git a/src/gtk/v3270/oia.c b/src/gtk/v3270/oia.c
index 41f9666..43b492f 100644
--- a/src/gtk/v3270/oia.c
+++ b/src/gtk/v3270/oia.c
@@ -175,7 +175,7 @@ static void setup_luname_position(GdkRectangle *rect, struct v3270_metrics *metr
 #ifdef DEBUG
 	cairo_set_source_rgb(cr,0.1,0.1,0.1);
 #else
-	gdk_cairo_set_source_color(cr,terminal->color+V3270_COLOR_OIA_BACKGROUND);
+	gdk_cairo_set_source_color(cr,color+V3270_COLOR_OIA_BACKGROUND);
 #endif
 
 	cairo_rectangle(cr, rect->x, rect->y, rect->width, rect->height);
@@ -305,7 +305,7 @@ void v3270_draw_ssl_status(cairo_t *cr, H3270 *host, struct v3270_metrics *metri
 #ifdef DEBUG
 	cairo_set_source_rgb(cr,0.1,0.1,0.1);
 #else
-	gdk_cairo_set_source_color(cr,terminal->color+V3270_COLOR_OIA_BACKGROUND);
+	gdk_cairo_set_source_color(cr,color+V3270_COLOR_OIA_BACKGROUND);
 #endif
 
 	cairo_translate(cr, rect->x, rect->y);
diff --git a/src/include/rules.mak.in b/src/include/rules.mak.in
index 58bb7cd..a664333 100644
--- a/src/include/rules.mak.in
+++ b/src/include/rules.mak.in
@@ -56,13 +56,24 @@ ROOTDIR ?= .
 OBJDIR  ?= $(ROOTDIR)/.obj
 BINDIR  ?= $(ROOTDIR)/.bin
 
+BINDBG  ?= $(BINDIR)/Debug
+BINRLS  ?= $(BINDIR)/Release
+
+OBJDBG = $(OBJDIR)/Debug
+OBJRLS = $(OBJDIR)/Release
+
 #---[ Rules ]------------------------------------------------------------------
 
-$(OBJDIR)/Debug/%.o: %.c $(DEPENDS)
+$(OBJDBG)/%.o: %.c $(DEPENDS)
 	@echo `basename $@` ...
 	@$(MKDIR) `dirname $@`
 	@$(CC) $(DEBUG_CFLAGS) $(CFLAGS) $(LIB3270_CFLAGS) -o $@ -c $<
 
+$(OBJRLS)/%.o: %.c $(DEPENDS)
+	@echo `basename $@` ...
+	@$(MKDIR) `dirname $@`
+	@$(CC) $(CFLAGS) $(LIB3270_CFLAGS) -o $@ -c $<
+
 #---[ Targets ]----------------------------------------------------------------
 
 clean-common:
diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in
index 941c606..a5ad87f 100644
--- a/src/lib3270/Makefile.in
+++ b/src/lib3270/Makefile.in
@@ -39,12 +39,24 @@ LIBS=@LIBS@ @LIBSSL_LIBS@ @SOCKET_LIBS@
 DEBUG_CFLAGS=-DDEBUG=1 -g
 DEPENDS ?= *.h ../../src/include/*.h Makefile
 
+#---[ Paths ]------------------------------------------------------------------
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+localedir=@localedir@
+
 #---[ Tools ]------------------------------------------------------------------
 
 MKDIR=@MKDIR_P@
 CC=@CC@
 LD=@CC@
 HOST_CC=@HOST_CC@
+STRIP=@STRIP@
+INSTALL=@INSTALL@
+INSTALL_PROGRAM=@INSTALL_PROGRAM@
+INSTALL_DATA=@INSTALL_DATA@
 
 #---[       ]------------------------------------------------------------------
 
@@ -56,17 +68,24 @@ ROOTDIR ?= .
 OBJDIR  ?= $(ROOTDIR)/.obj
 BINDIR  ?= $(ROOTDIR)/.bin
 DEPENDS ?= *.h Makefile
+
 BINDBG  ?= $(BINDIR)/Debug
+BINRLS  ?= $(BINDIR)/Release
 
 OBJDBG = $(OBJDIR)/Debug
+OBJRLS = $(OBJDIR)/Release
 
 #---[ Rules ]------------------------------------------------------------------
 
-$(OBJDIR)/Debug/%.o: %.c $(DEPENDS)
+$(OBJDBG)/%.o: %.c $(DEPENDS)
 	@echo $< ...
 	@$(MKDIR) `dirname $@`
 	@$(CC) $(DEBUG_CFLAGS) $(CFLAGS) $(SSL_CFLAGS) -o $@ -c $<
 
+$(OBJRLS)/%.o: %.c $(DEPENDS)
+	@echo $< ...
+	@$(MKDIR) `dirname $@`
+	@$(CC) $(CFLAGS) $(SSL_CFLAGS) -o $@ -c $<
 
 #---[ Sources ]----------------------------------------------------------------
 
@@ -79,14 +98,25 @@ SOURCES = XtGlue.c actions.c ansi.c charset.c ctlr.c \
 
 #---[ Misc targets ]-----------------------------------------------------------
 
-Debug: $(BINDBG)/@DLLPREFIX@3270@DLLEXT@
+Release: $(BINRLS)/@DLLPREFIX@3270@DLLEXT@
 
+install: Release
+	@$(MKDIR) $(DESTDIR)$(libdir)
+	@$(INSTALL_PROGRAM) $(BINRLS)/@DLLPREFIX@3270@DLLEXT@ $(DESTDIR)$(libdir)
+
+Debug: $(BINDBG)/@DLLPREFIX@3270@DLLEXT@
 
 $(BINDBG)/@DLLPREFIX@3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@)
 	@echo $@ ...
 	@$(MKDIR) `dirname $@`
 	@$(LD) $(DLL_FLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 
+$(BINRLS)/@DLLPREFIX@3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC)@OBJEXT@)
+	@echo $@ ...
+	@$(MKDIR) `dirname $@`
+	@$(LD) $(DLL_FLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+	@$(STRIP) $@
+
 version.c: ./mkversion.sh
 	@echo $@ ...
 	@chmod +x ./mkversion.sh
--
libgit2 0.21.2