diff --git a/ChangeLog b/ChangeLog
index 7cf2cac8176278ff4c1c95df7329656ff1e877ad..37fb46b0f6e3edf89289bfca8f28233a9f5cac7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@ CVS code -
   do_wrap()
 	- Move "right" increment to part where new line is created, 
 	  should change (fix?) some wrapping problems with autoindent.
+  version()
+  	- Show --enable-multibuffer independently of --enable-extra being
+	  compiled in (Jordi).
 - global.c:
   shorcut_init()
 	- Replace hard coded ALT_G and ALT_H values in the replace
diff --git a/nano.c b/nano.c
index 8ccd580d00fcf774852d0e35bd05b64c92362180..1635b6b17937b51e5ccc6e1bdc38bd0e0a49e87c 100644
--- a/nano.c
+++ b/nano.c
@@ -552,12 +552,10 @@ void version(void)
 
 #ifdef NANO_EXTRA
     printf(" --enable-extra");
-#else
+#endif
 #ifdef ENABLE_MULTIBUFFER
     printf(" --enable-multibuffer");
-#endif /* ENABLE_MULTIBUFFER */
-#endif /* NANO_EXTRA */
-
+#endif
 #ifdef ENABLE_NANORC
     printf(" --enable-nanorc");
 #endif