diff --git a/.gitignore b/.gitignore
index ea076ce..f90a3d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /aws-gpl-3.1.0-src.tgz
 /aws-manpages.tar.gz
 /aws-gpl-3.2.0-git20150523-src.tgz
+/aws-gpl-2015-src.tar.gz
diff --git a/aws-2015-config.patch b/aws-2015-config.patch
new file mode 100644
index 0000000..7bc6bed
--- /dev/null
+++ b/aws-2015-config.patch
@@ -0,0 +1,31 @@
+diff --git a/makefile.conf b/makefile.conf
+index 5f3de31..8aa3c01 100644
+--- a/makefile.conf
++++ b/makefile.conf
+@@ -98,7 +98,7 @@ IPv6	= false
+ #
+ # SOCKET = [std|openssl|gnutls]
+ #
+-SOCKET	= std
++SOCKET	= gnutls
+ 
+ ##############################################################################
+ # AWS provides a binding to the LDAP API. This binding will use the standard
+@@ -108,7 +108,7 @@ SOCKET	= std
+ #
+ # LDAP = [true|false]
+ #
+-LDAP	= false
++LDAP	= true
+ 
+ ##############################################################################
+ # To activate the debug mode just uncomment the variable below. This will
+@@ -116,7 +116,7 @@ LDAP	= false
+ #
+ # DEBUG = [true|false]
+ #
+-DEBUG	= false
++DEBUG	= true
+ 
+ ##############################################################################
+ # Number of parallel compilations to do.
diff --git a/aws-2015-remove_bundled.patch b/aws-2015-remove_bundled.patch
new file mode 100644
index 0000000..cd49511
--- /dev/null
+++ b/aws-2015-remove_bundled.patch
@@ -0,0 +1,289 @@
+diff --git a/makefile b/makefile
+index f041de6..bcf7739 100644
+--- a/makefile
++++ b/makefile
+@@ -69,7 +69,6 @@ build-doc:
+ 	echo ""
+ 	echo "=== Build doc"
+ 	${MAKE} -C docs html latexpdf
+-	${MAKE} -C templates_parser/docs html latexpdf
+ 
+ run_regtests:
+ 	echo ""
+@@ -344,7 +343,5 @@ gen_setup:
+ 	echo "TARGET=$(TARGET)" >> makefile.setup
+ 	echo "GSOAP=false" >> makefile.setup
+ 
+-setup: gen_setup setup_dir setup_modules setup_config setup_tp $(GEXT_MODULE)
++setup: gen_setup setup_dir setup_modules setup_config $(GEXT_MODULE)
+ 
+-setup_tp:
+-	$(MAKE) -C templates_parser setup $(GALL_OPTIONS)
+diff --git a/aws.gpr b/aws.gpr
+index dc43545..1bc35e2 100644
+--- a/aws.gpr
++++ b/aws.gpr
+@@ -17,7 +17,7 @@
+ ------------------------------------------------------------------------------
+ 
+ with "shared";
+-with "include/zlib/zlib.gpr";
++with "zlib_ada";
+ 
+ aggregate library project AWS is
+ 
+diff --git a/aws.gpr b/aws.gpr
+index 1bc35e2..5c0e430 100644
+--- a/aws.gpr
++++ b/aws.gpr
+@@ -23,14 +23,6 @@ aggregate library project AWS is
+ 
+    for Project_Files use ("include/include.gpr", "src/src.gpr", "ssl/ssl.gpr");
+ 
+-   case ZLib.Zlib_Activated is
+-      when "Yes" =>
+-         for Project_Files
+-           use Project'Project_Files & ("include/zlib/zlib.gpr");
+-      when "No" =>
+-         null;
+-   end case;
+-
+    for Library_Name use "aws";
+    for Library_Kind use Shared.Library_Type;
+    for Library_Dir use Shared'Library_Dir & "/aws";
+diff --git a/include/include.gpr b/include/include.gpr
+index c885f15..3a04e87 100644
+--- a/include/include.gpr
++++ b/include/include.gpr
+@@ -18,7 +18,7 @@
+ 
+ with "../shared";
+ 
+-with "zlib/zlib";
++with "zlib_ada";
+ 
+ library project Include is
+ 
+diff --git a/src/src.gpr b/src/src.gpr
+index b952590..a2180e4 100644
+--- a/src/src.gpr
++++ b/src/src.gpr
+@@ -27,7 +27,7 @@ library project Src is
+    for Languages use ("Ada", "Project file", "makefile");
+ 
+    for Source_Dirs use
+-     ("core", "extended", "../templates_parser/src", "../config/src",
++     ("core", "extended", "../config/src",
+       "../config/ssl", "../" & Shared.Target_Dir & "/setup/src", ".");
+ 
+    --  XMLAda Installed, add xsrc and soap directories
+@@ -35,7 +35,7 @@ library project Src is
+    case Shared.XMLAda is
+       when "Installed" =>
+          for Source_Dirs use project'Source_Dirs &
+-           ("xsrc", "soap", "../templates_parser/xsrc");
++           ("xsrc", "soap");
+       when "Disabled" =>
+          null;
+    end case;
+@@ -124,17 +124,6 @@ library project Src is
+       for Implementation_Suffix ("makefile") use ".txt";
+       for Implementation_Exceptions ("makefile") use ("makefile");
+ 
+-      -- Templates Parser
+-
+-      for Specification ("Templates_Parser.Configuration")
+-        use "templates_parser-configuration__aws.ads";
+-
+-      for Implementation ("Templates_Parser.Input")
+-        use "templates_parser-input__aws.adb";
+-
+-      for Implementation ("Templates_Parser_Tasking")
+-        use "templates_parser_tasking__standard_tasking.adb";
+-
+       --  SOCKLIB
+ 
+       case Shared.SOCKLIB is
+diff --git a/tools/tools.gpr b/tools/tools.gpr
+index bd56b9f..45fd418 100644
+--- a/tools/tools.gpr
++++ b/tools/tools.gpr
+@@ -25,10 +25,10 @@ project Tools is
+ 
+    for Languages use ("Ada", "Project file");
+ 
+-   for Source_Dirs use (".", "../templates_parser/tools");
++   for Source_Dirs use ("." );
+ 
+-   for Main use ("awsres.adb", "aws_password.adb", "templates2ada.adb",
+-                 "webxref.adb", "templatespp.adb");
++   for Main use ("awsres.adb", "aws_password.adb", 
++                 "webxref.adb");
+ 
+    case Shared.XMLAda is
+       when "Installed" =>
+diff --git a/tools/tools.gpr b/tools/tools.gpr
+index 45fd418..4ea006b 100644
+--- a/tools/tools.gpr
++++ b/tools/tools.gpr
+@@ -20,6 +20,7 @@ with "../.build/projects/aws_asis";
+ with "../shared.gpr";
+ with "../aws";
+ with "../win32/win32";
++with "templates_parser";
+ 
+ project Tools is
+ 
+diff --git a/src/src.gpr b/src/src.gpr
+index a2180e4..7d85237 100644
+--- a/src/src.gpr
++++ b/src/src.gpr
+@@ -21,6 +21,7 @@ with "../.build/projects/aws_xmlada";
+ with "../shared";
+ with "../include/include";
+ with "../ssl/ssl";
++with "templates_parser";
+ 
+ library project Src is
+ 
+diff --git a/makefile b/makefile
+index bcf7739..0ff33aa 100644
+--- a/makefile
++++ b/makefile
+@@ -179,7 +179,7 @@ GPR_SHARED = -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
+ #  build
+ 
+ build-native:
+-	$(GPRBUILD) -p $(GPROPTS) $(GPR_STATIC) tools/tools.gpr
++	$(GPRBUILD) -p $(GPROPTS) $(GPR_SHARED) tools/tools.gpr
+ ifeq (${ENABLE_SHARED}, true)
+ 	$(GPRBUILD) -p $(GPROPTS) $(GPR_SHARED) aws.gpr
+ endif
+diff --git a/aws.gpr b/aws.gpr
+index 5c0e430..7fb8bb9 100644
+--- a/aws.gpr
++++ b/aws.gpr
+@@ -26,6 +26,7 @@ aggregate library project AWS is
+    for Library_Name use "aws";
+    for Library_Kind use Shared.Library_Type;
+    for Library_Dir use Shared'Library_Dir & "/aws";
++   for Library_Options use ("-L", "-lzlib_ada", "-ltemplates_parser");
+ 
+    case Shared.Library_Type is
+       when "static" =>
+diff --git a/aws.gpr b/aws.gpr
+index 7fb8bb9..bda8d41 100644
+--- a/aws.gpr
++++ b/aws.gpr
+@@ -18,6 +18,8 @@
+ 
+ with "shared";
+ with "zlib_ada";
++with "templates_parser";
++with "xmlada";
+ 
+ aggregate library project AWS is
+ 
+diff --git a/tools/tools.gpr b/tools/tools.gpr
+index 4ea006b..0e95abc 100644
+--- a/tools/tools.gpr
++++ b/tools/tools.gpr
+@@ -72,7 +72,7 @@ project Tools is
+ 
+    package Binder is
+       for Default_Switches ("Ada")
+-         use Shared.Builder'Default_Switches ("Ada") & ("-static");
++         use Shared.Builder'Default_Switches ("Ada") & ("-shared");
+    end Binder;
+ 
+    -------------
+diff --git a/makefile b/makefile
+index 0ff33aa..99102e3 100644
+--- a/makefile
++++ b/makefile
+@@ -61,7 +61,7 @@ ALL_OPTIONS	= $(MAKE_OPT) SOCKET="$(SOCKET)" XMLADA="$(XMLADA)" \
+ 	GPRBUILD="$(GPRBUILD)" ZLIB="$(ZLIB)" BDIR="$(BDIR)" \
+ 	prefix="$(prefix)" ENABLE_SHARED="$(ENABLE_SHARED)" \
+ 	SOEXT="$(SOEXT)" BUILD_DOC_SCRIPT="false" GNAT="$(GNAT)" \
+-	T2A="../../$(BDIR)/static/tools/templates2ada" \
++	T2A="../../$(BDIR)/static/relocatable/templates2ada" \
+ 	LIBRARY_TYPE="$(LIBRARY_TYPE)" PYTHON="$(PYTHON)" \
+ 	TARGET="$(TARGET)" IS_CROSS=$(IS_CROSS) GPRINSTALL="$(GPRINSTALL)"
+ 
+@@ -240,7 +240,7 @@ install-native: install-clean
+ 	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
+ 		-XLIBRARY_TYPE=$(DEFAULT_LIBRARY_TYPE) aws.gpr
+ 	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
+-		-XLIBRARY_TYPE=static --mode=usage \
++		-XLIBRARY_TYPE=${DEFAULT_LIBRARY_TYPE} --mode=usage \
+ 		--install-name=aws tools/tools.gpr
+ ifeq (${ENABLE_SHARED}, true)
+ 	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
+diff --git a/makefile b/makefile
+index 99102e3..ed81e04 100644
+--- a/makefile
++++ b/makefile
+@@ -242,11 +242,6 @@ install-native: install-clean
+ 	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
+ 		-XLIBRARY_TYPE=${DEFAULT_LIBRARY_TYPE} --mode=usage \
+ 		--install-name=aws tools/tools.gpr
+-ifeq (${ENABLE_SHARED}, true)
+-	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
+-		-XLIBRARY_TYPE=$(OTHER_LIBRARY_TYPE) \
+-		--build-name=$(OTHER_LIBRARY_TYPE) aws.gpr
+-endif
+ 
+ install-cross: install-clean
+ 	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
+diff --git a/aws.gpr b/aws.gpr
+index 5b9c255..aaee268 100644
+--- a/aws.gpr
++++ b/aws.gpr
+@@ -30,6 +30,7 @@ aggregate library project AWS is
+    for Library_Kind use Shared.Library_Type;
+    for Library_Dir use Shared'Library_Dir & "/aws";
+    for Library_Options use ("-L", "-lzlib_ada", "-ltemplates_parser");
++   for Library_Version use "lib" & Project'Library_Name & "-2015.so";
+ 
+    case Shared.Library_Type is
+       when "static" =>
+diff --git a/aws.gpr b/aws.gpr
+index cbf80f6..479ab03 100644
+--- a/aws.gpr
++++ b/aws.gpr
+@@ -20,6 +20,7 @@ with "shared";
+ with "zlib_ada";
+ with "templates_parser";
+ with "xmlada";
++with "directories";
+ 
+ aggregate library project AWS is
+ 
+@@ -72,6 +73,7 @@ aggregate library project AWS is
+    package Install is
+       --  examples
+ 
++      for Lib_Subdir use Directories.Lib & "/aws/";
+       for Artifacts ("share/examples/aws/images")
+         use ("demos/runme/aws_*.png");
+       for Artifacts ("share/examples/aws/templates")
+diff --git a/makefile b/makefile
+index ed81e04..1c32df0 100644
+--- a/makefile
++++ b/makefile
+@@ -146,6 +146,7 @@ endif
+ #  Install directories
+ 
+ I_INC	= $(TPREFIX)/include/aws
++I_LIB  ?= ${TPREFIX}/lib
+ 
+ GALL_OPTIONS := $(ALL_OPTIONS) \
+ 	PRJ_BUILD="$(PRJ_BUILD)" \
+@@ -238,6 +239,7 @@ endif
+ 
+ install-native: install-clean
+ 	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
++		 --link-lib-subdir=${I_LIB} --lib-subdir=${I_LIB}/aws/ \
+ 		-XLIBRARY_TYPE=$(DEFAULT_LIBRARY_TYPE) aws.gpr
+ 	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
+ 		-XLIBRARY_TYPE=${DEFAULT_LIBRARY_TYPE} --mode=usage \
diff --git a/aws-3.2.0-config.patch b/aws-3.2.0-config.patch
deleted file mode 100644
index 7bc6bed..0000000
--- a/aws-3.2.0-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/makefile.conf b/makefile.conf
-index 5f3de31..8aa3c01 100644
---- a/makefile.conf
-+++ b/makefile.conf
-@@ -98,7 +98,7 @@ IPv6	= false
- #
- # SOCKET = [std|openssl|gnutls]
- #
--SOCKET	= std
-+SOCKET	= gnutls
- 
- ##############################################################################
- # AWS provides a binding to the LDAP API. This binding will use the standard
-@@ -108,7 +108,7 @@ SOCKET	= std
- #
- # LDAP = [true|false]
- #
--LDAP	= false
-+LDAP	= true
- 
- ##############################################################################
- # To activate the debug mode just uncomment the variable below. This will
-@@ -116,7 +116,7 @@ LDAP	= false
- #
- # DEBUG = [true|false]
- #
--DEBUG	= false
-+DEBUG	= true
- 
- ##############################################################################
- # Number of parallel compilations to do.
diff --git a/aws-3.2.0-remove_bundled.patch b/aws-3.2.0-remove_bundled.patch
deleted file mode 100644
index 7ad88ed..0000000
--- a/aws-3.2.0-remove_bundled.patch
+++ /dev/null
@@ -1,289 +0,0 @@
-diff --git a/makefile b/makefile
-index f041de6..bcf7739 100644
---- a/makefile
-+++ b/makefile
-@@ -69,7 +69,6 @@ build-doc:
- 	echo ""
- 	echo "=== Build doc"
- 	${MAKE} -C docs html latexpdf
--	${MAKE} -C templates_parser/docs html latexpdf
- 
- run_regtests:
- 	echo ""
-@@ -344,7 +343,5 @@ gen_setup:
- 	echo "TARGET=$(TARGET)" >> makefile.setup
- 	echo "GSOAP=false" >> makefile.setup
- 
--setup: gen_setup setup_dir setup_modules setup_config setup_tp $(GEXT_MODULE)
-+setup: gen_setup setup_dir setup_modules setup_config $(GEXT_MODULE)
- 
--setup_tp:
--	$(MAKE) -C templates_parser setup $(GALL_OPTIONS)
-diff --git a/aws.gpr b/aws.gpr
-index dc43545..1bc35e2 100644
---- a/aws.gpr
-+++ b/aws.gpr
-@@ -17,7 +17,7 @@
- ------------------------------------------------------------------------------
- 
- with "shared";
--with "include/zlib/zlib.gpr";
-+with "zlib_ada";
- 
- aggregate library project AWS is
- 
-diff --git a/aws.gpr b/aws.gpr
-index 1bc35e2..5c0e430 100644
---- a/aws.gpr
-+++ b/aws.gpr
-@@ -23,14 +23,6 @@ aggregate library project AWS is
- 
-    for Project_Files use ("include/include.gpr", "src/src.gpr", "ssl/ssl.gpr");
- 
--   case ZLib.Zlib_Activated is
--      when "Yes" =>
--         for Project_Files
--           use Project'Project_Files & ("include/zlib/zlib.gpr");
--      when "No" =>
--         null;
--   end case;
--
-    for Library_Name use "aws";
-    for Library_Kind use Shared.Library_Type;
-    for Library_Dir use Shared'Library_Dir & "/aws";
-diff --git a/include/include.gpr b/include/include.gpr
-index c885f15..3a04e87 100644
---- a/include/include.gpr
-+++ b/include/include.gpr
-@@ -18,7 +18,7 @@
- 
- with "../shared";
- 
--with "zlib/zlib";
-+with "zlib_ada";
- 
- library project Include is
- 
-diff --git a/src/src.gpr b/src/src.gpr
-index b952590..a2180e4 100644
---- a/src/src.gpr
-+++ b/src/src.gpr
-@@ -27,7 +27,7 @@ library project Src is
-    for Languages use ("Ada", "Project file", "makefile");
- 
-    for Source_Dirs use
--     ("core", "extended", "../templates_parser/src", "../config/src",
-+     ("core", "extended", "../config/src",
-       "../config/ssl", "../" & Shared.Target_Dir & "/setup/src", ".");
- 
-    --  XMLAda Installed, add xsrc and soap directories
-@@ -35,7 +35,7 @@ library project Src is
-    case Shared.XMLAda is
-       when "Installed" =>
-          for Source_Dirs use project'Source_Dirs &
--           ("xsrc", "soap", "../templates_parser/xsrc");
-+           ("xsrc", "soap");
-       when "Disabled" =>
-          null;
-    end case;
-@@ -124,17 +124,6 @@ library project Src is
-       for Implementation_Suffix ("makefile") use ".txt";
-       for Implementation_Exceptions ("makefile") use ("makefile");
- 
--      -- Templates Parser
--
--      for Specification ("Templates_Parser.Configuration")
--        use "templates_parser-configuration__aws.ads";
--
--      for Implementation ("Templates_Parser.Input")
--        use "templates_parser-input__aws.adb";
--
--      for Implementation ("Templates_Parser_Tasking")
--        use "templates_parser_tasking__standard_tasking.adb";
--
-       --  SOCKLIB
- 
-       case Shared.SOCKLIB is
-diff --git a/tools/tools.gpr b/tools/tools.gpr
-index bd56b9f..45fd418 100644
---- a/tools/tools.gpr
-+++ b/tools/tools.gpr
-@@ -25,10 +25,10 @@ project Tools is
- 
-    for Languages use ("Ada", "Project file");
- 
--   for Source_Dirs use (".", "../templates_parser/tools");
-+   for Source_Dirs use ("." );
- 
--   for Main use ("awsres.adb", "aws_password.adb", "templates2ada.adb",
--                 "webxref.adb", "templatespp.adb");
-+   for Main use ("awsres.adb", "aws_password.adb", 
-+                 "webxref.adb");
- 
-    case Shared.XMLAda is
-       when "Installed" =>
-diff --git a/tools/tools.gpr b/tools/tools.gpr
-index 45fd418..4ea006b 100644
---- a/tools/tools.gpr
-+++ b/tools/tools.gpr
-@@ -20,6 +20,7 @@ with "../.build/projects/aws_asis";
- with "../shared.gpr";
- with "../aws";
- with "../win32/win32";
-+with "templates_parser";
- 
- project Tools is
- 
-diff --git a/src/src.gpr b/src/src.gpr
-index a2180e4..7d85237 100644
---- a/src/src.gpr
-+++ b/src/src.gpr
-@@ -21,6 +21,7 @@ with "../.build/projects/aws_xmlada";
- with "../shared";
- with "../include/include";
- with "../ssl/ssl";
-+with "templates_parser";
- 
- library project Src is
- 
-diff --git a/makefile b/makefile
-index bcf7739..0ff33aa 100644
---- a/makefile
-+++ b/makefile
-@@ -179,7 +179,7 @@ GPR_SHARED = -XLIBRARY_TYPE=relocatable -XXMLADA_BUILD=relocatable
- #  build
- 
- build-native:
--	$(GPRBUILD) -p $(GPROPTS) $(GPR_STATIC) tools/tools.gpr
-+	$(GPRBUILD) -p $(GPROPTS) $(GPR_SHARED) tools/tools.gpr
- ifeq (${ENABLE_SHARED}, true)
- 	$(GPRBUILD) -p $(GPROPTS) $(GPR_SHARED) aws.gpr
- endif
-diff --git a/aws.gpr b/aws.gpr
-index 5c0e430..7fb8bb9 100644
---- a/aws.gpr
-+++ b/aws.gpr
-@@ -26,6 +26,7 @@ aggregate library project AWS is
-    for Library_Name use "aws";
-    for Library_Kind use Shared.Library_Type;
-    for Library_Dir use Shared'Library_Dir & "/aws";
-+   for Library_Options use ("-L", "-lzlib_ada", "-ltemplates_parser");
- 
-    case Shared.Library_Type is
-       when "static" =>
-diff --git a/aws.gpr b/aws.gpr
-index 7fb8bb9..bda8d41 100644
---- a/aws.gpr
-+++ b/aws.gpr
-@@ -18,6 +18,8 @@
- 
- with "shared";
- with "zlib_ada";
-+with "templates_parser";
-+with "xmlada";
- 
- aggregate library project AWS is
- 
-diff --git a/tools/tools.gpr b/tools/tools.gpr
-index 4ea006b..0e95abc 100644
---- a/tools/tools.gpr
-+++ b/tools/tools.gpr
-@@ -72,7 +72,7 @@ project Tools is
- 
-    package Binder is
-       for Default_Switches ("Ada")
--         use Shared.Builder'Default_Switches ("Ada") & ("-static");
-+         use Shared.Builder'Default_Switches ("Ada") & ("-shared");
-    end Binder;
- 
-    -------------
-diff --git a/makefile b/makefile
-index 0ff33aa..99102e3 100644
---- a/makefile
-+++ b/makefile
-@@ -61,7 +61,7 @@ ALL_OPTIONS	= $(MAKE_OPT) SOCKET="$(SOCKET)" XMLADA="$(XMLADA)" \
- 	GPRBUILD="$(GPRBUILD)" ZLIB="$(ZLIB)" BDIR="$(BDIR)" \
- 	prefix="$(prefix)" ENABLE_SHARED="$(ENABLE_SHARED)" \
- 	SOEXT="$(SOEXT)" BUILD_DOC_SCRIPT="false" GNAT="$(GNAT)" \
--	T2A="../../$(BDIR)/static/tools/templates2ada" \
-+	T2A="../../$(BDIR)/static/relocatable/templates2ada" \
- 	LIBRARY_TYPE="$(LIBRARY_TYPE)" PYTHON="$(PYTHON)" \
- 	TARGET="$(TARGET)" IS_CROSS=$(IS_CROSS) GPRINSTALL="$(GPRINSTALL)"
- 
-@@ -240,7 +240,7 @@ install-native: install-clean
- 	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
- 		-XLIBRARY_TYPE=$(DEFAULT_LIBRARY_TYPE) aws.gpr
- 	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
--		-XLIBRARY_TYPE=static --mode=usage \
-+		-XLIBRARY_TYPE=${DEFAULT_LIBRARY_TYPE} --mode=usage \
- 		--install-name=aws tools/tools.gpr
- ifeq (${ENABLE_SHARED}, true)
- 	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
-diff --git a/makefile b/makefile
-index 99102e3..ed81e04 100644
---- a/makefile
-+++ b/makefile
-@@ -242,11 +242,6 @@ install-native: install-clean
- 	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
- 		-XLIBRARY_TYPE=${DEFAULT_LIBRARY_TYPE} --mode=usage \
- 		--install-name=aws tools/tools.gpr
--ifeq (${ENABLE_SHARED}, true)
--	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
--		-XLIBRARY_TYPE=$(OTHER_LIBRARY_TYPE) \
--		--build-name=$(OTHER_LIBRARY_TYPE) aws.gpr
--endif
- 
- install-cross: install-clean
- 	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
-diff --git a/aws.gpr b/aws.gpr
-index 5b9c255..aaee268 100644
---- a/aws.gpr
-+++ b/aws.gpr
-@@ -30,6 +30,7 @@ aggregate library project AWS is
-    for Library_Kind use Shared.Library_Type;
-    for Library_Dir use Shared'Library_Dir & "/aws";
-    for Library_Options use ("-L", "-lzlib_ada", "-ltemplates_parser");
-+   for Library_Version use "lib" & Project'Library_Name & "-3.2.0.so";
- 
-    case Shared.Library_Type is
-       when "static" =>
-diff --git a/aws.gpr b/aws.gpr
-index cbf80f6..479ab03 100644
---- a/aws.gpr
-+++ b/aws.gpr
-@@ -20,6 +20,7 @@ with "shared";
- with "zlib_ada";
- with "templates_parser";
- with "xmlada";
-+with "directories";
- 
- aggregate library project AWS is
- 
-@@ -72,6 +73,7 @@ aggregate library project AWS is
-    package Install is
-       --  examples
- 
-+      for Lib_Subdir use Directories.Lib & "/aws/";
-       for Artifacts ("share/examples/aws/images")
-         use ("demos/runme/aws_*.png");
-       for Artifacts ("share/examples/aws/templates")
-diff --git a/makefile b/makefile
-index ed81e04..1c32df0 100644
---- a/makefile
-+++ b/makefile
-@@ -146,6 +146,7 @@ endif
- #  Install directories
- 
- I_INC	= $(TPREFIX)/include/aws
-+I_LIB  ?= ${TPREFIX}/lib
- 
- GALL_OPTIONS := $(ALL_OPTIONS) \
- 	PRJ_BUILD="$(PRJ_BUILD)" \
-@@ -238,6 +239,7 @@ endif
- 
- install-native: install-clean
- 	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
-+		 --link-lib-subdir=${I_LIB} --lib-subdir=${I_LIB}/aws/ \
- 		-XLIBRARY_TYPE=$(DEFAULT_LIBRARY_TYPE) aws.gpr
- 	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(TPREFIX) \
- 		-XLIBRARY_TYPE=${DEFAULT_LIBRARY_TYPE} --mode=usage \
diff --git a/aws.spec b/aws.spec
index 648da84..499c929 100644
--- a/aws.spec
+++ b/aws.spec
@@ -1,10 +1,9 @@
 %undefine _hardened_build
 %global with_gnutls 1
 %global with_gps 0
-%global git_release git20150523
 Name:       aws 
-Version:    3.2.0
-Release:    2.%{git_release}%{?dist}
+Version:    2015
+Release:    1%{?dist}
 Summary:    Ada Web Server
 
 Group:      System Environment/Libraries
@@ -12,7 +11,7 @@ License:    GPLv3+ with exceptions and GPLv2+
 URL:        http://libre.adacore.com/tools/aws 
 ## Direct download does't work
 ## http://libre.adacore.com/libre/download/
-Source0:    %{name}-gpl-%{version}-%{git_release}-src.tgz
+Source0:    %{name}-gpl-%{version}-src.tar.gz
 Source1:    %{name}-manpages.tar.gz
 Patch0:     %{name}-%{version}-remove_bundled.patch
 Patch1:     %{name}-%{version}-config.patch
@@ -134,6 +133,9 @@ rm -rf %{buildroot}/%{_datadir}/gps
 
 
 %changelog
+* Thu Jun 25 2015 Pavel Zhukov <landgraf@fedoraproject.org> - 2015-1
+- New release (#2015)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.0-2.git20150523
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 97992c6..1061c81 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3436b317531712e6691a35d4a2462c92  aws-gpl-3.2.0-git20150523-src.tgz
+128ceb046d36defcd3bc836ecc4460fa  aws-gpl-2015-src.tar.gz
 f007a1a9c73f629f48e551b6cad102c0  aws-manpages.tar.gz