Index: lisp/jde.el
===================================================================
--- lisp/jde.el	(revision 248)
+++ lisp/jde.el	(working copy)
@@ -61,7 +61,7 @@
    (defalias 'custom-set-default 'set-default))
 
 ;; Use the full Java 1.5 grammar to parse Java files
-(autoload 'wisent-java-default-setup "wisent-java" "Hook run to setup Semantic in `java-mode'." nil nil)
+(autoload 'wisent-java-default-setup "semantic/wisent/java-tags" "Hook run to setup Semantic in `java-mode'." nil nil)
 
 (defun jde-semantic-require (sym)
   (cond ((string= sym 'senator)
@@ -117,6 +117,8 @@
 (require 'jde-annotations)
 (require 'regress)
 
+(add-to-list 'semantic-new-buffer-setup-functions '(jde-mode . wisent-java-default-setup))
+
 (if (not (fboundp 'custom-set-default))
     (defalias 'custom-set-default 'set-default))
 
Index: lisp/jde-java-grammar.el
===================================================================
--- lisp/jde-java-grammar.el	(revision 248)
+++ lisp/jde-java-grammar.el	(working copy)
@@ -74,7 +74,8 @@
     ;; already enabled globally (since Semantic 1.4beta12).
     (or (and (boundp 'global-senator-minor-mode)
 	     global-senator-minor-mode)
-	(senator-minor-mode 1)))
+	(and (fboundp 'senator-minor-mode)
+	     (senator-minor-mode 1))))
 
   ;; imenu & speedbar setup
   (jde-imenu-setup)
Index: lisp/jde-import.el
===================================================================
--- lisp/jde-import.el	(revision 248)
+++ lisp/jde-import.el	(working copy)
@@ -39,6 +39,7 @@
 
 (require 'efc)
 (jde-semantic-require 'semantic-fw)
+(jde-semantic-require 'semantic-edit)
 (jde-semantic-require 'semantic-find)
 (jde-semantic-require 'semantic-util)
 (jde-require 'sregex)