diff --git a/Makefile.am b/Makefile.am
index 2f482ad7..0e8c89f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,3 +66,13 @@ EXTRA_DIST=\
     $(man1_MANS)\
     $(markdown_FILES)\
     $(markdown_SC_FILES)
+
+##
+# Indent
+##
+
+indent: ${rofi_SOURCES}
+	uncrustify -c ${top_srcdir}/data/uncrustify.cfg --replace $^
+
+update-manpage: ${top_srcdir}/doc/rofi-manpage.markdown
+	md2man-roff $^ > ${top_srcdir}/doc/rofi.1 
diff --git a/doc/rofi-manpage.markdown b/doc/rofi-manpage.markdown
index dea1c5d1..802de926 100644
--- a/doc/rofi-manpage.markdown
+++ b/doc/rofi-manpage.markdown
@@ -13,8 +13,7 @@ SYNOPSIS
 [ -bg *color* ] [ -hlfg *color* ] [ -hlbg *color* ] [ -key *combo* ] [ -dkey *comdo* ] [ -rkey *comdo* ]
 [ -terminal *terminal* ] [ -loc *position* ] [ -hmode ] [ -fixed-num-lines ] [ -padding *padding* ]
 [ -opacity *opacity%* ] [ -display *display* ] [ -bc *color* ] [ -bw *width* ] [ -dmenu [ -p *prompt* ] ]
-[ -ssh-set-title *true|false* ] [ -now ] [ -rnow ] [ -snow ] [ -version ] [ -help] [ -dump ] 
-[ -dump-xresources ]
+[ -ssh-set-title *true|false* ] [ -now ] [ -rnow ] [ -snow ] [ -version ] [ -help] [ -dump-xresources ]
 
 DESCRIPTION
 -----------
@@ -201,10 +200,6 @@ OPTIONS
 
   Run rofi in dmenu mode. Allowing it to be used for user interaction in scripts.
 
-`-dump`
-
-  Dump the current active configuration to the command-line.
-
 `-dump-xresources`
 
   Dump the current active configuration in xresources format to the command-line.
diff --git a/source/rofi.c b/source/rofi.c
index b57e2412..e859292d 100644
--- a/source/rofi.c
+++ b/source/rofi.c
@@ -1947,12 +1947,6 @@ static void parse_cmd_options ( int argc, char ** argv )
 
 
     // Dump.
-    if ( find_arg ( argc, argv, "-dump" ) >= 0 )
-    {
-        config_print ();
-        exit ( EXIT_SUCCESS );
-    }
-
     if ( find_arg ( argc, argv, "-dump-xresources" ) >= 0 )
     {
         xresource_dump ();
@@ -2036,55 +2030,6 @@ void config_sanity_check ( void )
     }
 }
 
-/**
- * Print out the current configuration.
- */
-void config_print ( void )
-{
-    printf ( "Windows opacity:                      %3d%%\n", config.window_opacity );
-    printf ( "Border width:                         %3d\n", config.menu_bw );
-    printf ( "Padding:                              %3d\n", config.padding );
-    printf ( "Width:                               %4d%s\n", config.menu_width,
-             config.menu_width > 100 ? "px" : "%" );
-    printf ( "offset (x,y):                     (%2d,%2d)px\n", config.x_offset, config.y_offset );
-    printf ( "Location:                      " );
-    switch ( config.location )
-    {
-    case WL_CENTER:     printf ( "    Center\n" ); break;
-    case WL_NORTH_WEST: printf ( "North West\n" ); break;
-    case WL_NORTH:      printf ( "     North\n" ); break;
-    case WL_NORTH_EAST: printf ( "North East\n" ); break;
-    case WL_EAST:       printf ( "      East\n" ); break;
-    case WL_EAST_SOUTH: printf ( "East South\n" ); break;
-    case WL_SOUTH:      printf ( "     South\n" ); break;
-    case WL_SOUTH_WEST: printf ( "South West\n" ); break;
-    case WL_WEST:       printf ( "      West\n" ); break;
-    default:            printf ( "   Invalid\n" ); break;
-    }
-    printf ( "# Lines:                              %3d\n", config.menu_lines );
-    printf ( "# Columns:                            %3d\n", config.menu_columns );
-    printf ( "Fixed number of lines:              %5s\n", config.fixed_num_lines ? "true" : "false" );
-    printf ( "Horizontal model:                   %5s\n", config.hmode == TRUE ? "true" : "false" );
-
-
-    printf ( "Font: %35s\n", config.menu_font );
-    /* Colors */
-    printf ( "FG Color:                         %7s\n", config.menu_fg );
-    printf ( "BG Color:                         %7s\n", config.menu_bg );
-    printf ( "Highlight FG Color:               %7s\n", config.menu_hlfg );
-    printf ( "Highlight BG Color:               %7s\n", config.menu_hlbg );
-    printf ( "Border color:                     %7s\n", config.menu_bc );
-
-    /* Terminal */
-    printf ( "Terminal emulator: %22s\n", config.terminal_emulator );
-    printf ( "SSH dialog set terminal title:      %5s\n", config.ssh_set_title ? "true" : "false" );
-    /* Keybindings. */
-    printf ( "Window switcher key:              %7s\n", config.window_key );
-    printf ( "Run dialog key:                   %7s\n", config.run_key );
-    printf ( "SSH dialog key:                   %7s\n", config.ssh_key );
-}
-
-
 
 int main ( int argc, char *argv[] )
 {