diff --git a/ChangeLog b/ChangeLog
index 1acc70ff47d75d987dce40294418ea401ab1993c_Q2hhbmdlTG9n..c9c4bc98365e98f3dceff41c78c2218cf0f097d1_Q2hhbmdlTG9n 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1998-02-26  SL Baur  <steve@altair.xemacs.org>
+
+	* filladapt.el: Version 2.12 courtesy of Kyle Jones.
+
 1998-02-25  SL Baur  <steve@altair.xemacs.org>
 
 	* xrdb-mode.el (xrdb-submit-bug-report): Require reporter here
diff --git a/Makefile b/Makefile
index 1acc70ff47d75d987dce40294418ea401ab1993c_TWFrZWZpbGU=..c9c4bc98365e98f3dceff41c78c2218cf0f097d1_TWFrZWZpbGU= 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
 
 # This XEmacs package contains independent single file lisp packages
 
-VERSION = 1.04
+VERSION = 1.05
 AUTHOR_VERSION =
 MAINTAINER = XEmacs Development Team <xemacs-beta@xemacs.org>
 PACKAGE = text-modes
diff --git a/filladapt.el b/filladapt.el
index 1acc70ff47d75d987dce40294418ea401ab1993c_ZmlsbGFkYXB0LmVs..c9c4bc98365e98f3dceff41c78c2218cf0f097d1_ZmlsbGFkYXB0LmVs 100644
--- a/filladapt.el
+++ b/filladapt.el
@@ -1,5 +1,5 @@
 ;;; Adaptive fill
-;;; Copyright (C) 1989, 1995, 1996, 1997 Kyle E. Jones
+;;; Copyright (C) 1989, 1995-1998 Kyle E. Jones
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 ;; LCD Archive Entry: 
 ;; filladapt|Kyle Jones|kyle_jones@wonderworks.com| 
 ;; Minor mode to adaptively set fill-prefix and overload filling functions|
-;; 10-June-1996|2.10|~/packages/filladapt.el| 
+;; 26-February-1998|2.11|~/packages/filladapt.el| 
 
 ;; These functions enhance the default behavior of Emacs' Auto Fill
 ;; mode and the commands fill-paragraph, lisp-fill-paragraph,
@@ -72,6 +72,9 @@
 
 (provide 'filladapt)
 
+(defvar filladapt-version "2.11"
+  "Version string for filladapt.")
+
 ;; BLOB to make custom stuff work even without customize
 (eval-and-compile
   (condition-case ()
@@ -89,9 +92,6 @@
   "Enhanced filling"
   :group 'fill)
 
-(defvar filladapt-version "2.10"
-  "Version string for filladapt.")
-
 (defcustom filladapt-mode nil
   "*Non-nil means that Filladapt minor mode is enabled.
 Use the filladapt-mode command to toggle the mode on/off."
@@ -149,7 +149,7 @@
     (">+" citation->)
     ;; Included text generated by SUPERCITE.  We can't hope to match all
     ;; the possible variations, your mileage may vary.
-    ("[A-Za-z0-9][^'`\"< \t\n]*>[ \t]*" supercite-citation)
+    ("\\(\\w\\|[0-9]\\)[^'`\"< \t\n]*>[ \t]*" supercite-citation)
     ;; Lisp comments
     (";+" lisp-comment)
     ;; UNIX shell comments
@@ -232,8 +232,8 @@
 
 (defcustom filladapt-not-token-table
   '(
-    "[Ee].g."
-    "[Ii].e."
+    "[Ee]\\.g\\.[ \t,]"
+    "[Ii]\\.e\\.[ \t,]"
     ;; end-of-line isn't a token if whole line is empty
     "^$"
    )