diff --git a/Makefile.in b/Makefile.in
index c977c0e..5f83e61 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -176,7 +176,8 @@ $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Debug@DLLDIR
 $(BINDIR)/Debug@DLLDIR@/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile
 	@$(MAKE) BINDBG=../../.bin/Debug@DLLDIR@ -C src/lib3270 ../../.bin/Debug@DLLDIR@/@DLLPREFIX@3270@DLLEXT@
 
-run: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png
+run: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png \
+		$(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Debug/plugins/$(PLUGIN)@DLLEXT@)
 	@$(DBGCMDPREFIX) "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)"
 
 memchk: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
diff --git a/configure.ac b/configure.ac
index 8a61033..26042ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -278,32 +278,29 @@ AC_ARG_ENABLE([java],[AS_HELP_STRING([--disable-java], [Disable java integration
 
 if test "$app_cv_java" = "yes" ; then
 
-	# Check for JDK_HOME
-	if test "_$JDK_HOME" = "_" ; then
-		AC_CHECK_FILE("/usr/java/default/bin/javac",JDK_HOME="/usr/java/default",)
-	fi
-
-	if test "_$JDK_HOME" = "_" ; then
+	# Check for JAVA_HOME
+	if test "_$JAVA_HOME" = "_" ; then
 		app_cv_java="no"
 	fi
 
 	# Check for JRE_HOME
 	if test "_$JRE_HOME" = "_" ; then
-		JRE_HOME="\$(JDK_HOME)/jre"
+		JRE_HOME="\$(JAVA_HOME)/jre"
 	fi
 
 fi
 
 if test "$app_cv_java" = "yes" ; then
-	AC_PATH_TOOL([JAVAC], [javac], [\$(JDK_HOME)/bin/javac])
-	AC_PATH_TOOL([JAVAH], [javah], [\$(JDK_HOME)/bin/javah])
-	AC_PATH_TOOL([JAR], [jar], [\$(JDK_HOME)/bin/jar])
+	AC_PATH_TOOL([JAVA], [java], [no], [$PATH:$JAVA_HOME/bin])
+	AC_PATH_TOOL([JAVAC], [javac], [no], [$PATH:$JAVA_HOME/bin])
+	AC_PATH_TOOL([JAVAH], [javah], [no], [$PATH:$JAVA_HOME/bin])
+	AC_PATH_TOOL([JAR], [jar], [no], [$PATH:$JAVA_HOME/bin])
 fi
 
 AC_SUBST(JAVAC)
 AC_SUBST(JAVAH)
 AC_SUBST(JAR)
-AC_SUBST(JDK_HOME)
+AC_SUBST(JAVA_HOME)
 AC_SUBST(JRE_HOME)
 
 #--[ Misc options ]-------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5ffa20d..0a08854 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-25 08:29-0300\n"
+"POT-Creation-Date: 2013-02-25 08:36-0300\n"
 "PO-Revision-Date: 2013-02-25 08:31-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português <>\n"
diff --git a/pw3270.spec.in b/pw3270.spec.in
index 8363e45..ee4ab2c 100644
--- a/pw3270.spec.in
+++ b/pw3270.spec.in
@@ -110,6 +110,16 @@ devel for tn3270 protocol library for %{name}
 
 Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
 
+%package plugin-dbus
+Summary:	DBUS object for %{name}
+Group:		System/X11/Terminals
+Requires:	%{name} = @PACKAGE_VERSION@
+
+%description plugin-dbus
+Plugin exporting a DBUS object from every %{name} open session.
+
+Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
+
 #---[ Build & Install ]-----------------------------------------------------------------------------------------------
 
 %prep
@@ -177,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/@PACKAGE_NAME@/sample
 %{_datadir}/@PACKAGE_NAME@/sample/*
 
+%files plugin-dbus
+%{_datadir}/@PACKAGE_NAME@/plugins/dbus3270.so
+
 #---[ Scripts ]-------------------------------------------------------------------------------------------------------
 
 %post
--
libgit2 0.21.2