diff --git a/po/POTFILES.in b/po/POTFILES.in
index b45b39034d..bba9a51511 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,6 +8,7 @@ src/converter.C
 src/CutAndPaste.C
 src/debug.C
 src/exporter.C
+src/ext_l10n.h
 src/FloatList.C
 src/frontends/controllers/biblio.C
 src/frontends/controllers/ButtonController.h
@@ -160,6 +161,7 @@ src/mathed/formula.C
 src/mathed/formulamacro.C
 src/mathed/math_cursor.C
 src/mathed/math_hullinset.C
+src/mathed/math_parboxinset.C
 src/mathed/ref_inset.C
 src/MenuBackend.C
 src/paragraph.C
diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index c2eaf4302f..a70c4d8f4d 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-10  Andrew Zabolotny  <zap@cobra.ru>
+
+	* XMiniBuffer.C (peek_event): 
+	* combox.C (peek_event): 
+	* DropDown.C (peek): support keypad keys
+
 2002-07-09  John Levon  <moz@compsoc.man.ac.uk>
 
 	* xscreen.C: add const
diff --git a/src/frontends/xforms/DropDown.C b/src/frontends/xforms/DropDown.C
index 1ab9468b7f..837cbea2d4 100644
--- a/src/frontends/xforms/DropDown.C
+++ b/src/frontends/xforms/DropDown.C
@@ -136,12 +136,21 @@ int DropDown::peek(XEvent * xev)
 		XLookupString(&xev->xkey, s_r, 10, &keysym_return, 0);
 		switch (keysym_return) {
 		case XK_Down:
+#ifdef XK_KP_Down
+		case XK_KP_Down:
+#endif
 			line_down();
 			return 1;
 		case XK_Up:
+#ifdef XK_KP_Up
+		case XK_KP_Up:
+#endif
 			line_up();
 			return 1;
 		case XK_Return:
+#ifdef XK_KP_Enter
+		case XK_KP_Enter:
+#endif
 			completed();
 			return 1;
 		case XK_Escape:
diff --git a/src/frontends/xforms/XMiniBuffer.C b/src/frontends/xforms/XMiniBuffer.C
index b516d103f6..790a16234e 100644
--- a/src/frontends/xforms/XMiniBuffer.C
+++ b/src/frontends/xforms/XMiniBuffer.C
@@ -103,6 +103,9 @@ int XMiniBuffer::peek_event(FL_OBJECT * ob, int event,
 
 		switch (key) {
 		case XK_Down:
+#ifdef XK_KP_Down
+		case XK_KP_Down:
+#endif
 			if (hist_iter != history_->end()) {
 				++hist_iter;
 			}
@@ -114,6 +117,9 @@ int XMiniBuffer::peek_event(FL_OBJECT * ob, int event,
 			}
 			return 1;
 		case XK_Up:
+#ifdef XK_KP_Up
+		case XK_KP_Up:
+#endif
 			if (hist_iter == history_->begin()) {
 				// no further history
 				show_information(_("[Beginning of history]"),
@@ -188,6 +194,9 @@ int XMiniBuffer::peek_event(FL_OBJECT * ob, int event,
 			return 1;
 		case 13:
 		case XK_Return:
+#ifdef XK_KP_Enter
+		case XK_KP_Enter:
+#endif
 		{
 #if 0
 			// This will go in again in a little while
diff --git a/src/frontends/xforms/combox.C b/src/frontends/xforms/combox.C
index fa7a531755..839eab9ac1 100644
--- a/src/frontends/xforms/combox.C
+++ b/src/frontends/xforms/combox.C
@@ -460,6 +460,9 @@ int Combox::peek_event(FL_FORM * form, void * xev)
 	XFlush(fl_get_display());
 	switch (keysym_return) {
 	case XK_Down:
+#ifdef XK_KP_Down
+	case XK_KP_Down:
+#endif
 		if (fl_get_browser(combo->browser) <
 		    fl_get_browser_maxline(combo->browser))
 			fl_select_browser_line(combo->browser,
@@ -476,6 +479,9 @@ int Combox::peek_event(FL_FORM * form, void * xev)
 					       fl_get_browser(combo->browser));
 		return 1;
 	case XK_Up:
+#ifdef XK_KP_Up
+	case XK_KP_Up:
+#endif
 		if (fl_get_browser(combo->browser) > 1)
 			fl_select_browser_line(combo->browser,
 					       fl_get_browser(combo->browser)-1);
@@ -491,6 +497,9 @@ int Combox::peek_event(FL_FORM * form, void * xev)
 					       fl_get_browser(combo->browser));
 		return 1;
 	case XK_Return:
+#ifdef XK_KP_Enter
+	case XK_KP_Enter:
+#endif
 		combo->hide();
 		return 1;
 	case XK_Escape: