diff --git a/astylerc b/astylerc
new file mode 100644
index 0000000000000000000000000000000000000000..14177d0fa0ef4086ca0e03957f3f17361d80b493
--- /dev/null
+++ b/astylerc
@@ -0,0 +1,15 @@
+# Filename: sflphone-common/astylerc
+# Purpose:  config file for astyle
+#            http://astyle.sourceforge.net/astyle.html
+# Author:  Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
+#           Savoir-faire Linux Inc
+#          http://www.sflphone.org 
+
+style=kr                # Kernighan & Ritchie style formatting/indenting uses linux bracket
+indent=spaces=4         # Use spaces instead of tabs for indentation
+indent-classes          # Indent 'class' and 'struct' blocks so that the blocks 'public:', 'protected:' and 'private:' are indented
+indent-switches         # Indent 'switch' blocks so that the 'case X:' statements are indented in the switch block
+break-blocks            # Pad empty lines around header blocks (e.g. 'if', 'while'...).
+brackets=linux
+unpad=paren
+-d
diff --git a/sflphone-common/Makefile.am b/sflphone-common/Makefile.am
index ffd473d7d1fb1878fcc9cc46d7505db095930206..64ee4c390b9880aeb7b94b418517466407f6ad30 100644
--- a/sflphone-common/Makefile.am
+++ b/sflphone-common/Makefile.am
@@ -1,5 +1,9 @@
+include globals.mak
+
 # Makefile.am
 
+SOURCES=
+
 if BUILD_TEST
 TESTS_DIR=test
 unittest:
@@ -14,8 +18,14 @@ unittest:
 	@echo " -- You need the cppunit devel package to compile the unitary tests."
 endif
 
-ACLOCAL_AMFLAGS = -I m4
+indent:
+	@echo "Indenting code:"
+	if [ -f $(ASTYLERC) ] ; then \
+		$(indent) --options=$(ASTYLERC) --recursive *.cpp *.h; \
+	fi
 
+
+ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = libs src ringtones po man $(TESTS_DIR)
 EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/* README.gentoo
 
diff --git a/sflphone-common/globals.mak b/sflphone-common/globals.mak
index 3bd883bd3091b4daedc226cb89ca9d1282ccba65..e6f165a1ac990f1dd0872e18d732a3e84afa8448 100644
--- a/sflphone-common/globals.mak
+++ b/sflphone-common/globals.mak
@@ -3,6 +3,9 @@ src=$(top_srcdir)
 sflcodecdir=$(DESTDIR)$(libdir)/sflphone/codecs
 sflplugindir=$(DESTDIR)$(libdir)/sflphone/plugins
 
+ASTYLERC="../astylerc"
+indent="/usr/bin/astyle"
+
 PJSIP_VERSION="1.0.2"
 
 # for pjsip