diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cfc1601b098..22069406451 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp-adb.el (tramp-adb-file-name-p): Make it a defsubst.
+	Otherwise, there could be errors in autoloading.  (Bug#13151)
+
 2012-12-13  Jürgen Hötzel  <juergen@archlinux.org>
 
 	* net/tramp-adb.el (tramp-adb-wait-for-output): Remove spurious " ^H"
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index b5b31828bb1..5d13d56f638 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -112,7 +112,7 @@
   "Alist of handler functions for Tramp ADB method.")
 
 ;;;###tramp-autoload
-(defun tramp-adb-file-name-p (filename)
+(defsubst tramp-adb-file-name-p (filename)
   "Check if it's a filename for ADB."
   (let ((v (tramp-dissect-file-name filename)))
     (string= (tramp-file-name-method v) tramp-adb-method)))