2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c4f5efd371e..66051898dd3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-11-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * emacs-lisp/byte-run.el (defmacro, defun): Set their `indent' property.
+
         * electric.el (electric-indent-post-self-insert-function):
         Only delete trailing whitepsace if it is indeed trailing (bug#15767).
 
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 0bb04950dfd..7ec24cc2aad 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -118,6 +118,7 @@ the FUN corresponding to PROP is called with the function name
 and the VALUES and should return the code to use to set this property.")
 
 (put 'defmacro 'doc-string-elt 3)
+(put 'defmacro 'lisp-indent-function 2)
 (defalias 'defmacro
   (cons
    'macro
@@ -179,7 +180,7 @@ The return value is undefined.
   ;;    (defun foo (arg) (toto) nil)
   ;; from
   ;;    (defun foo (arg) (toto)).
-  (declare (doc-string 3))
+  (declare (doc-string 3) (indent 2))
   (let ((decls (cond
                 ((eq (car-safe docstring) 'declare)
                  (prog1 (cdr docstring) (setq docstring nil)))