diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 08575323ea1..94735a81b7e 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* nntp.el (nntp-service-to-port): Work for port expressed with numeric
+	string; replace [:digit:] with [0-9] for XEmacs.
+
 2009-12-17  Glenn Morris  <rgm@gnu.org>
 
 	* gnus-group.el (gnus-bug-group-download-format-alist):
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 8a6c9a2d78a..0f696e508b9 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1816,13 +1816,13 @@ via telnet.")
 (defun nntp-service-to-port (svc)
   (cond
    ((integerp svc) (number-to-string svc))
-   ((string-match "\\`[[:digit:]]\\'" svc) svc)
+   ((string-match "\\`[0-9]+\\'" svc) svc)
    (t
     (with-temp-buffer
       (ignore-errors (insert-file-contents "/etc/services"))
       (goto-char (point-min))
       (if (re-search-forward (concat "^" (regexp-quote svc)
-                                     "[ \t]+\\([[:digit:]]+\\)/tcp"))
+                                     "[ \t]+\\([0-9]+\\)/tcp"))
           (match-string 1)
         svc)))))