diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..25cda79
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,6 @@
+Example: http://git.savannah.gnu.org/cgit/make.git/tree/AUTHORS
+
+GNU Coding Standards 6.3: Recording Contributors
+http://www.gnu.org/prep/maintain/html_node/Recording-Contributors.html
+
+First version of all files by Ruben Laguna <ruben.laguna at gmail.com>
diff --git a/LICENSE b/COPYING
similarity index 100%
rename from LICENSE
rename to COPYING
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..534318b
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,6 @@
+GNU Coding Standards 6.8 ChangeLogs:
+http://www.gnu.org/prep/standards/html_node/Change-Logs.html#Change-Logs
+
+2014-01-25 Ruben laguna <ruben.laguna at gmail.com>
+
+  * main.c (some_function) : Fix something.
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..af437a6
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = src
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..9e5cd13
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,19 @@
+Read GNU Coding Standards 6.7 
+http://www.gnu.org/prep/standards/html_node/NEWS-File.html#NEWS-File
+
+Example: http://git.savannah.gnu.org/cgit/make.git/tree/NEWS
+
+YourProject NEWS
+  History of user-visible changes
+  25 Jan 2015
+
+See the end of this file for copyrights and conditions.
+
+
+Version 1.0.0
+
+  * New features: XXXX
+    Description of the feature
+    
+
+
diff --git a/README b/README
new file mode 100644
index 0000000..23c69af
--- /dev/null
+++ b/README
@@ -0,0 +1,6 @@
+# autotools-template
+Template for an autotools (autoconf, automake) project
+
+# Files provided:
+* autogen.sh: will generate the .configure and Makefile.in templates
+              from configure.ac and the Makefile.am files
diff --git a/README.md b/README.md
deleted file mode 100644
index 2705786..0000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# autotools-template
-Template for an autotools (autoconf, automake) project
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..6444ba4
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# As seen on
+#   Autotools A Practitioner's Guide to GNU Autoconf, 
+#     Automake, and Libtool by John Calcote
+#
+# autoreconf runs all the autotool configuration tools in the right order
+# and will avoid regenerating files. 
+# 
+autoreconf --install # install missing files
+automake --add-missing --copy >/dev/null 2>&1 # add install-sh 
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..a63f6e7
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,26 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.69])
+AC_INIT([FULL-PACKAGE-NAME], [VERSION], [BUG-REPORT-ADDRESS])
+AM_INIT_AUTOMAKE
+AC_CONFIG_SRCDIR([src/main.c])
+AC_CONFIG_HEADERS([config.h])
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_INSTALL
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_CHECK_HEADERS([stdlib.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+
+
+AC_CONFIG_FILES([Makefile
+                 src/Makefile])
+AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..b702a43
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,2 @@
+bin_PROGRAMS = myexecutable
+myexecutable_SOURCES = main.c
diff --git a/src/main.c b/src/main.c
new file mode 100644
index 0000000..8236c9c
--- /dev/null
+++ b/src/main.c
@@ -0,0 +1,7 @@
+#include <stdio.h>
+
+int main(int argc, char *argv[])
+{
+  printf ("Hello world\n");
+  return 0;
+}