diff --git a/mac/pw3270.bundle b/mac/pw3270.bundle
new file mode 100644
index 0000000..c9c750b
--- /dev/null
+++ b/mac/pw3270.bundle
@@ -0,0 +1,160 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<app-bundle>
+
+  <meta>
+    <!-- Where to pick up the GTK+ installation, icon themes,
+         etc. Note that "${env:JHBUILD_PREFIX}" is evaluated to the
+         value of the environment variable JHBUILD_PREFIX. You can
+         define additional prefixes and refer to them in paths
+         throughout this file on the form "${prefix:name}". This is
+         useful for installing certain libraries or even the
+         application itself separately. Note that JHBUILD_PREFIX is
+         defined by jhbuild, so it you are not using jhbuild you can
+         either define your own or just hardcode the path here.
+    -->
+    <prefix name="default">${env:JHBUILD_PREFIX}</prefix>
+    <prefix name="bin">${project}/../.bin/Release</prefix>
+
+    <!-- The project directory is the default location of the created
+         app. If you leave out the path, the current directory is
+         used. Note the usage of an environment variable here again.
+    -->
+    <destination overwrite="yes">${project}/../.bin</destination>
+
+    <image>
+      <!-- Not implemented yet (DMG image). -->
+    </image>
+
+    <!-- Comment this out to keep the install names in binaries -->
+    <run-install-name-tool/>
+
+    <!-- Optionally specify a launcher script to use. If the
+         application sets up everything needed itself, like
+         environment variable, linker paths, etc, a launcher script is
+         not needed. If the source path is left out, the default
+         script will be used.
+    -->
+    <launcher-script>${project}/launcher.sh</launcher-script >
+
+    <!-- Not implemented: Optional runtime, could be python or mono
+         for example.
+    -->
+    <!-- runtime copy="yes">/usr/bin/python</runtime -->
+    <!-- Indicate the active gtk version to use. This is needed only
+         for gtk+-3.0 projects. -->
+    <gtk>gtk+-3.0</gtk>
+  </meta>
+
+  <!-- The special macro "${project}" refers to the directory where
+       this bundle file is located. The application name and bundle
+       identifier are taken from the plist file.
+  -->
+  <plist>${project}/Info.plist</plist>
+
+  <main-binary>${prefix:bin}/pw3270</main-binary>
+  <binary>
+	 ${prefix:bin}/lib/*.so.5.0
+  </binary>
+
+  <!-- Copy in GTK+ modules. Note the ${gtkdir} macro, which expands
+       to the correct library subdirectory for the specified gtk
+       version.
+  -->
+ <!--
+  <binary>
+     ${prefix}/lib/${gtkdir}/modules/*.so
+  </binary>
+-->
+  <!-- Copy in GTK+ theme engines and print backends. Note the use of the
+       "${pkg:module:variable}" macro, which evaluates to a pkg-config
+       variable in the specified module. Note that any libraries that
+       binaries link to are also copied in automatically.  Note also
+       the included ${gtk} macro, which gets the correct package name
+       to get. -->
+ <!---
+  <binary>
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/*.so
+  </binary>
+ -->
+  <binary>
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
+  </binary>
+
+<!-- Starting with 2.24, gdk-pixbuf installs into its own directory. -->
+<!--
+  <binary>
+    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/*.so
+  </binary>
+-->
+
+  <!-- Translation filenames, one for each program or library that you
+       want to copy in to the bundle. The "dest" attribute is
+       optional, as usual. Bundler will find all translations of that
+       library/program under the indicated directory and copy them.-->
+  <translations  name="gtk30">
+    ${prefix}/share/locale
+  </translations>
+
+
+  <!-- Data to copy in, usually Glade/UI files, images, sounds files
+       etc. The destination inside the bundle can be specified if the
+       files should end up at a different location, by using the
+       "dest" property. The destination must then start with the macro
+       "${bundle}", which refers to the bundle root directory.
+  -->
+  <data dest="${bundle}/Contents/Resources/share/ui/00default.xml">
+	 ${project}/../ui/00default.xml
+  </data>
+
+  <data dest="${bundle}/Contents/Resources/share/colors.conf">
+	 ${project}/../colors.conf
+  </data>
+
+  <data dest="${bundle}/Contents/LICENCA">
+	${project}/../LICENCA
+  </data>
+
+  <data dest="${bundle}/Contents/LICENSE">
+	${project}/../LICENSE
+  </data>
+
+  <data dest="${bundle}/Contents/AUTHORS">
+	${project}/../AUTHORS
+  </data>
+
+  <!-- Copy in the themes data. You may want to trim this to save space
+       in your bundle. -->
+  <data>
+    ${prefix}/share/themes
+  </data>
+
+  <!-- Copy icons. Note that the .icns file is an Apple format which
+       contains up to 4 sizes of icon. You can use
+       /Developer/Applications/Utilities/Icon Composer.app to import
+       artwork and create the file. >
+  <data dest="${bundle}/Contents/Resources">
+    ${project}/Giggle.icns
+  </data -->
+
+  <!-- This is where theme commands go. You can copy them in from your
+       theme of choice if they provide and example, or you can just
+       change the source path. -->
+<!--
+  <data dest="${bundle}/Contents/Resources/etc/${gtk}/gtkrc">
+    ${project}/gtkrc
+  </data>
+-->
+  <!-- Icon themes to copy. The "icons" property can be either of
+       "auto", "all", or "none". All or none should be
+       self-explanatory, while auto means that the script will try to
+       figure out which icons are needed. This is done by getting all
+       the strings from all copied binaries, and matching them against
+       icon names. To be safe, you should use "all". "none" is useful
+       if you want just the index.theme file but no icons, mostly
+       needed for the "hicolor" base theme.
+  >
+  <icon-theme icons="auto">
+    Tango
+  </icon-theme -->
+
+</app-bundle>
\ No newline at end of file
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d209324..a365e53 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: 2012-08-31 04:17-0300\n"
+"POT-Creation-Date: 2012-09-01 05:19-0300\n"
 "PO-Revision-Date: 2012-08-27 09:01-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português do Brasil <>\n"
@@ -18,32 +18,32 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: kybd.c:2638
+#: kybd.c:2644
 #, c-format
 msgid "%s: Bell not supported"
 msgstr "%s: Alerta sonoro não suportado"
 
-#: kybd.c:2797
+#: kybd.c:2803
 #, c-format
 msgid "%s: Missing hex digits after \\x"
 msgstr "%s: Faltando dígitos hexadecimais após \\x"
 
-#: kybd.c:2737
+#: kybd.c:2743
 #, c-format
 msgid "%s: Unknown character after \\p"
 msgstr "%s: Unknown character after \\p"
 
-#: kybd.c:2773
+#: kybd.c:2779
 #, c-format
 msgid "%s: Unknown character after \\pa"
 msgstr "%s: Unknown character after \\pa"
 
-#: kybd.c:2751
+#: kybd.c:2757
 #, c-format
 msgid "%s: Unknown character after \\pf"
 msgstr "%s: Unknown character after \\pf"
 
-#: kybd.c:2689
+#: kybd.c:2695
 #, c-format
 msgid "%s: Vertical tab not supported"
 msgstr "%s: Tabulação verticao não suportada"
@@ -58,15 +58,15 @@ msgstr "%s: Familia %d é inválida"
 msgid "%s:%d"
 msgstr "%s:%d"
 
-#: screen.c:639 screen.c:641 screen.c:671 screen.c:685 screen.c:796
+#: screen.c:656 screen.c:658 screen.c:688 screen.c:702 screen.c:813
 msgid "3270 Error"
 msgstr "Erro 3270"
 
-#: screen.c:656
+#: screen.c:673
 msgid "3270 Warning"
 msgstr "Alerta 3270"
 
-#: telnet.c:3178
+#: telnet.c:3181
 #, c-format
 msgid ""
 "<b>Connection state:</b> %s\n"
@@ -107,7 +107,7 @@ msgstr "Cursor piscante"
 msgid "Bold"
 msgstr "Negrito"
 
-#: telnet.c:2053
+#: telnet.c:2056
 msgid "Broken pipe"
 msgstr "Broken pipe"
 
@@ -145,7 +145,7 @@ msgstr "Cancelado pelo usuário"
 msgid "Cannot create socket handle"
 msgstr "Não foi possível criar um manipulador de socket"
 
-#: session.c:315
+#: session.c:317
 #, c-format
 msgid "Cannot find charset \"%s\", using defaults"
 msgstr "Não encontrei codificação \"%s\", usando defaults"
@@ -184,7 +184,7 @@ msgstr "Conectar ao iniciar"
 msgid "Connection failed"
 msgstr "Conexão falhou"
 
-#: telnet.c:2057
+#: telnet.c:2060
 msgid "Connection reset by peer"
 msgstr "Conexão foi cancelada pelo servidor"
 
@@ -220,7 +220,7 @@ msgstr "Debug"
 msgid "Debug window updates"
 msgstr "Mostrar atualizações de janela"
 
-#: telnet.c:1729
+#: telnet.c:1731
 msgid "Device type rejected"
 msgstr "Tipo de dispositivo rejeitado"
 
@@ -228,7 +228,7 @@ msgstr "Tipo de dispositivo rejeitado"
 msgid "Disconnected from host"
 msgstr "Desconectado do servidor"
 
-#: telnet.c:1304
+#: telnet.c:1306
 msgid "EOR received when not in 3270 mode, ignored."
 msgstr "EOR recebido fora do modo 3270, ignorado."
 
@@ -329,15 +329,15 @@ msgstr "Ajuda"
 msgid "Host disconnected, transfer cancelled"
 msgstr "Servidor desconectou, transferência cancelada"
 
-#: telnet.c:1787
+#: telnet.c:1789
 msgid "Host illegally added function(s)"
 msgstr "Host illegally added function(s)"
 
-#: telnet.c:1712
+#: telnet.c:1714
 msgid "Host rejected device type or request type"
 msgstr "Servidor rejeitou o tipo de dispositivo ou requisição"
 
-#: telnet.c:1725
+#: telnet.c:1727
 msgid "Host rejected resource(s)"
 msgstr "Servidor rejeitou recurso(s)"
 
@@ -673,7 +673,7 @@ msgstr "SOCKS5 Proxy: xmit version 5 nmethods 1 (no auth)\n"
 msgid "SOCKS5 proxy: %s/%u: %s"
 msgstr "SOCKS5 proxy: %s/%u: %s"
 
-#: telnet.c:3176
+#: telnet.c:3179
 msgid "SSL Connect error"
 msgstr "Erro na conexão SSL"
 
@@ -693,7 +693,7 @@ msgstr "Erro SSL"
 msgid "SSL negotiation failed"
 msgstr "Negociação SSL falhou"
 
-#: telnet.c:2043
+#: telnet.c:2046
 #, c-format
 msgid ""
 "SSL_write:\n"
@@ -770,7 +770,7 @@ msgstr "Colar inteligente"
 msgid "Socket read error"
 msgstr "Erro ao ler dados da rede"
 
-#: telnet.c:2064
+#: telnet.c:2067
 msgid "Socket write error"
 msgstr "Erro ao enviar dados para a rede"
 
@@ -782,7 +782,7 @@ msgstr "Espaço no nome da LU"
 msgid "TELNET Proxy: send error"
 msgstr "TELNET Proxy: send error"
 
-#: telnet.c:3227
+#: telnet.c:3230
 msgid "TLS negotiation failure"
 msgstr "Negociação TLS falhou"
 
@@ -844,12 +844,12 @@ msgstr "Não foi possível enviar a requisição de transferência de arquivo"
 msgid "Unexpected error"
 msgstr "Erro inesperado"
 
-#: kybd.c:336
+#: kybd.c:338
 #, c-format
 msgid "Unexpected type %d in typeahead queue"
 msgstr "Tipo inesperado %d na fila de teclado"
 
-#: ctlr.c:498
+#: ctlr.c:505
 #, c-format
 msgid "Unknown 3270 Data Stream command: 0x%X"
 msgstr "Unknown 3270 Data Stream command: 0x%X"
@@ -858,12 +858,12 @@ msgstr "Unknown 3270 Data Stream command: 0x%X"
 msgid "Unknown FT control code from host"
 msgstr "Servidor enviou código de controle FT desconhecido"
 
-#: kybd.c:2387
+#: kybd.c:2393
 #, c-format
 msgid "Unknown PA key %d"
 msgstr "PA %d desconhecida"
 
-#: kybd.c:2402
+#: kybd.c:2408
 #, c-format
 msgid "Unknown PF key %d"
 msgstr "PF %d desconhecida"
@@ -959,12 +959,12 @@ msgstr "Opções"
 msgid "_View"
 msgstr "_Exibir"
 
-#: telnet.c:3041 telnet.c:3052
+#: telnet.c:3044 telnet.c:3055
 #, c-format
 msgid "fcntl(%s)"
 msgstr "fcntl(%s)"
 
-#: telnet.c:3031
+#: telnet.c:3034
 #, c-format
 msgid "ioctl(%s)"
 msgstr "ioctl(%s)"
diff --git a/pw3270.komodoproject b/pw3270.komodoproject
new file mode 100644
index 0000000..7c3ba41
--- /dev/null
+++ b/pw3270.komodoproject
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Komodo Project File - DO NOT EDIT -->
+<project id="835c3792-90af-274e-8705-405cacf376e1" kpf_version="5" name="pw3270.komodoproject">
+</project>
diff --git a/src/include/pw3270.h b/src/include/pw3270.h
index 56d61be..e6f6bb7 100644
--- a/src/include/pw3270.h
+++ b/src/include/pw3270.h
@@ -62,11 +62,10 @@
  LIB3270_EXPORT void		  pw3270_restore_window_state(GtkWidget *widget, const gchar *name);
 
 #ifdef HAVE_GTKMAC
- LIB3270_EXPORT				  GtkMacBundle * pw3270_get_bundle(void);
+ #include <gtk-mac-bundle.h>
+ LIB3270_EXPORT GtkMacBundle	* pw3270_get_bundle(void);
 #endif
 
-
-
  G_END_DECLS
 
 #endif // PW3270_H_INCLUDED
diff --git a/src/pw3270/main.c b/src/pw3270/main.c
index e659112..f186c01 100644
--- a/src/pw3270/main.c
+++ b/src/pw3270/main.c
@@ -32,6 +32,11 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include "globals.h"
+
+#ifdef HAVE_GTKMAC
+ #include <gtkosxapplication.h>
+#endif // HAVE_GTKMAC
+
 #include <v3270.h>
 #include "v3270/accessible.h"
 #include <stdlib.h>
@@ -259,4 +264,3 @@ int main(int argc, char *argv[])
 
 	return rc;
 }
-
--
libgit2 0.21.2