diff --git a/Makefile.in b/Makefile.in
index 55c0c0f..6dd96d0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,7 +100,16 @@ $(BINDIR)/Release/%@EXEEXT@: $(OBJDIR)/Release/%@OBJEXT@
 $(BINDIR)/pot/%.pot: src/plugins/%/*
 	@$(MAKE) -C $(dir $<) $@
 
-$(BINDIR)/pot/%.pot: src/%/*
+$(BINDIR)/pot/lib.pot: src/lib/*.c
+	@$(MAKE) -C $(dir $<) $@
+
+$(BINDIR)/pot/gtk2.pot: src/gtk2/*.c
+	@$(MAKE) -C $(dir $<) $@
+
+$(BINDIR)/pot/rexx.pot: src/plugins/rexx/*.c
+	@$(MAKE) -C $(dir $<) $@
+
+$(BINDIR)/pot/java.pot: src/plugins/java/*.c
 	@$(MAKE) -C $(dir $<) $@
 
 $(BINDIR)/Release/$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: po/%.po
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6ff025e..1506e1b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -103,6 +103,10 @@ msgstr "Copiar anexando"
 msgid "Add/Remove CR at end of line"
 msgstr "Inserir/Remover CR no final da linha"
 
+#: ui/default.xml:110
+msgid "Alert sound"
+msgstr "Aviso sonoro"
+
 #: filetransfer.c:393
 msgid "Append"
 msgstr "Adicionar"
diff --git a/src/gtk2/actions.c b/src/gtk2/actions.c
index b426379..55c63f4 100644
--- a/src/gtk2/actions.c
+++ b/src/gtk2/actions.c
@@ -386,8 +386,6 @@
  {
  	int idx = ((int) id) + N_TOGGLES;
 
-	Trace("*************** %p %p %p ",toggle_action[idx].reset, toggle_action[idx].set, toggle_action[idx].toggle);
-
 	if(toggle_action[idx].reset)
 		gtk_action_set_visible(toggle_action[idx].reset,visible && gui_toggle_state[id]);
 
diff --git a/src/gtk2/actions1.c b/src/gtk2/actions1.c
index 8dc5995..b717c1e 100644
--- a/src/gtk2/actions1.c
+++ b/src/gtk2/actions1.c
@@ -71,7 +71,8 @@
     { "KeepSelected", 	    FALSE	},
     { "Underline",		    TRUE	},
     { "AutoConnect",    	TRUE	},
-    { "KPAlternative",		FALSE	}
+    { "KPAlternative",		FALSE	},
+    { "Beep",				TRUE	},
  };
 
  gboolean gui_toggle_state[GUI_TOGGLE_COUNT] = { 0 };
diff --git a/src/gtk2/gui.h b/src/gtk2/gui.h
index ae4b9e8..43754f9 100644
--- a/src/gtk2/gui.h
+++ b/src/gtk2/gui.h
@@ -126,7 +126,8 @@
         GUI_TOGGLE_KEEP_SELECTED,
         GUI_TOGGLE_UNDERLINE,
         GUI_TOGGLE_CONNECT_ON_STARTUP,
-        GUI_TOGGKE_KP_ALTERNATIVE,		/**< Keypad +/- move to next/previous field */
+        GUI_TOGGLE_KP_ALTERNATIVE,		/**< Keypad +/- move to next/previous field */
+        GUI_TOGGLE_BEEP,
 
         GUI_TOGGLE_COUNT
     };
@@ -136,7 +137,8 @@
     #define TOGGLED_SMART_PASTE		    gui_toggle_state[GUI_TOGGLE_SMART_PASTE]
     #define TOGGLED_UNDERLINE		    gui_toggle_state[GUI_TOGGLE_UNDERLINE]
     #define TOGGLED_CONNECT_ON_STARTUP  gui_toggle_state[GUI_TOGGLE_CONNECT_ON_STARTUP]
-    #define TOGGLED_KP_ALTERNATIVE		gui_toggle_state[GUI_TOGGKE_KP_ALTERNATIVE]
+    #define TOGGLED_KP_ALTERNATIVE		gui_toggle_state[GUI_TOGGLE_KP_ALTERNATIVE]
+    #define TOGGLED_BEEP				gui_toggle_state[GUI_TOGGLE_BEEP]
 
     LOCAL_EXTERN gboolean		  gui_toggle_state[GUI_TOGGLE_COUNT];
 	LOCAL_EXTERN const gchar	* gui_toggle_name[GUI_TOGGLE_COUNT+1];
diff --git a/src/gtk2/screen.c b/src/gtk2/screen.c
index 57487d2..d386de8 100644
--- a/src/gtk2/screen.c
+++ b/src/gtk2/screen.c
@@ -91,6 +91,14 @@
 
 /*---[ Globals ]-------------------------------------------------------------------------------------------*/
 
+ static void ring_bell(void)
+ {
+	if(TOGGLED_BEEP)
+	{
+		gdk_beep();
+	}
+ }
+
  const struct lib3270_screen_callbacks program_screen_callbacks =
  {
 	sizeof(struct lib3270_screen_callbacks),
@@ -107,7 +115,7 @@
 	addch,					// void (*addch)(int row, int col, unsigned char c, int attr);
 	set_charset,			// void (*charset)(char *dcs);
 	settitle,				// void (*title)(char *text);
-	gdk_beep,				// void (*ring_bell)(void);
+	ring_bell,				// void (*ring_bell)(void);
 	redraw,					// void (*redraw)(void);
 	update_cursor_position,	// void (*move_cursor)(H3270 *session, unsigned short row, unsigned short col, unsigned char c, unsigned short attr);
 	SetSuspended,			// int	(*set_suspended)(int state);
diff --git a/src/gtk2/toggle.c b/src/gtk2/toggle.c
index 178e225..436a55d 100644
--- a/src/gtk2/toggle.c
+++ b/src/gtk2/toggle.c
@@ -35,7 +35,7 @@
 /*---[ Globals ]------------------------------------------------------------------------------------------------*/
 
  gboolean		  gui_toggle_state[GUI_TOGGLE_COUNT]	= { 0 };
- const gchar	* gui_toggle_name[GUI_TOGGLE_COUNT+1]	= { "Bold", "KeepSelected", "Underline", "AutoConnect", "KPAlternative", NULL };
+ const gchar	* gui_toggle_name[GUI_TOGGLE_COUNT+1]	= { "Bold", "KeepSelected", "Underline", "AutoConnect", "KPAlternative", "Beep", NULL };
 
 /*---[ Implement ]----------------------------------------------------------------------------------------------*/
 
diff --git a/src/include/lib3270/api.h b/src/include/lib3270/api.h
index 643e89a..f99920a 100644
--- a/src/include/lib3270/api.h
+++ b/src/include/lib3270/api.h
@@ -117,7 +117,6 @@
 		#define LUNAME_SIZE				16
 		#define FULL_MODEL_NAME_SIZE	13
 
-
 		/* State change IDs. */
 		typedef enum _lib3270_state
 		{
@@ -189,7 +188,6 @@
 		struct lib3270_state_callback;
 
 		typedef struct _h3270 H3270;
-
 		struct _h3270
 		{
 			unsigned short 	  sz;				/**< Struct size */
diff --git a/ui/default.xml b/ui/default.xml
index da3ca6b..0d3a62c 100644
--- a/ui/default.xml
+++ b/ui/default.xml
@@ -107,6 +107,7 @@
 				<menuitem action='Toggle' id='Underline' label='Show Underline'  />
 				<menuitem action='Toggle' id='KeepSelected' label='Keep selected' />
 				<menuitem action='Toggle' id='SmartPaste' label='Smart paste' />
+				<menuitem action='Toggle' id='Beep' label='Alert sound' />
 				<menuitem action='Toggle' id='KPAlternative' label='Use +/- for field navigation' />
 			</menu>
 
--
libgit2 0.21.2