diff --git a/sflphone-client-gnome/globals.mak b/sflphone-client-gnome/globals.mak
index 8fe5ee180b5b23c08aaff4dda0927d41bdbdeb32..359696c7dd4c7ba93f1258c56be480121c312a29 100644
--- a/sflphone-client-gnome/globals.mak
+++ b/sflphone-client-gnome/globals.mak
@@ -1,6 +1,9 @@
 # Global variables
 src = $(top_srcdir)
 
+ASTYLERC="$(top_srcdir)/../astylerc"
+indent="/usr/bin/astyle"
+
 # Preprocessor flags
 AM_CPPFLAGS =		$(DEPS_CFLAGS)										\
 					$(LIBSEXY_CFLAGS)									\
@@ -21,3 +24,8 @@ AM_CPPFLAGS =		$(DEPS_CFLAGS)										\
 					-DLOCALEDIR=\""$(localedir)"\"							\
 					-DSFLPHONE_UIDIR=\""$(datadir)/sflphone/ui"\"
 
+indent:
+	@echo "Indenting code:"
+	if [ -f $(ASTYLERC) ] ; then \
+		find $(top_srcdir)/src/ -regex ".*\.\(h\|c\)" -exec $(indent) --options=$(ASTYLERC) {} \; ; \
+	fi
diff --git a/sflphone-client-gnome/src/Makefile.am b/sflphone-client-gnome/src/Makefile.am
index 57fb2e4689c4b90983255c477e6aa014e40f4ea7..f279e1d8d3d77898e8cb27fef430e8b462acfa7d 100644
--- a/sflphone-client-gnome/src/Makefile.am
+++ b/sflphone-client-gnome/src/Makefile.am
@@ -42,3 +42,5 @@ install-exec-local:
 
 uninstall-local:
 	-test -h $(DESTDIR)$(bindir)/sflphone && rm $(DESTDIR)$(bindir)/sflphone
+
+all: indent