diff --git a/helpers/DATA/apache2/index.html b/helpers/DATA/apache2/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..1490e0383c8ef3efec8fa24e7632a7f3d4fab41d
--- /dev/null
+++ b/helpers/DATA/apache2/index.html
@@ -0,0 +1,353 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Trisquel GNU/Linux Default Page for Apache2: It works</title>
+ <style type="text/css" media="screen">
+ * {
+ margin: 0px 0px 0px 0px;
+ padding: 0px 0px 0px 0px;
+ }
+
+ body, html {
+ padding: 3px 3px 3px 3px;
+
+ background-color: #D8DBE2;
+
+ font-family: Verdana, sans-serif;
+ font-size: 11pt;
+ text-align: center;
+ }
+
+ img{
+ padding:15px;
+ }
+
+ div.main_page {
+ position: relative;
+ display: table;
+
+ width: 800px;
+
+ margin-bottom: 3px;
+ margin-left: auto;
+ margin-right: auto;
+ padding: 0px 0px 0px 0px;
+
+ border-width: 2px;
+ border-color: #212738;
+ border-style: solid;
+
+ background-color: #FFFFFF;
+
+ text-align: center;
+ }
+
+ div.page_header {
+ width: 100%;
+
+ background-color: #F5F6F7;
+ }
+
+ div.page_header span {
+ margin: 55px 0px 0px 80px;
+
+ font-size: 180%;
+ font-weight: bold;
+ }
+
+ div.page_header img {
+ margin: 3px 0px 0px 40px;
+
+ border: 0px 0px 0px;
+ }
+
+ div.table_of_contents {
+ clear: left;
+
+ min-width: 200px;
+
+ margin: 3px 3px 3px 3px;
+
+ background-color: #FFFFFF;
+
+ text-align: left;
+ }
+
+ div.table_of_contents_item {
+ clear: left;
+
+ width: 100%;
+
+ margin: 4px 0px 0px 0px;
+
+ background-color: #FFFFFF;
+
+ color: #000000;
+ text-align: left;
+ }
+
+ div.table_of_contents_item a {
+ margin: 6px 0px 0px 6px;
+ }
+
+ div.content_section {
+ margin: 3px 3px 3px 3px;
+
+ background-color: #FFFFFF;
+
+ text-align: left;
+ }
+
+ div.content_section_text {
+ padding: 4px 8px 4px 8px;
+
+ color: #000000;
+ font-size: 100%;
+ }
+
+ div.content_section_text pre {
+ margin: 8px 0px 8px 0px;
+ padding: 8px 8px 8px 8px;
+
+ border-width: 1px;
+ border-style: dotted;
+ border-color: #000000;
+
+ background-color: #F5F6F7;
+
+ font-style: italic;
+ }
+
+ div.content_section_text p {
+ margin-bottom: 6px;
+ }
+
+ div.content_section_text ul, div.content_section_text li {
+ padding: 4px 8px 4px 16px;
+ }
+
+ div.section_header {
+ padding: 3px 6px 3px 6px;
+
+ background-color: #8E9CB2;
+
+ color: #FFFFFF;
+ font-weight: bold;
+ font-size: 112%;
+ text-align: center;
+ }
+
+ div.section_header_blue {
+ background-color: #3B5996;
+ }
+
+ div.section_header_grey {
+ background-color: #9F9386;
+ }
+
+ .floating_element {
+ position: relative;
+ float: left;
+ }
+
+ div.table_of_contents_item a,
+ div.content_section_text a {
+ text-decoration: none;
+ font-weight: bold;
+ }
+
+ div.table_of_contents_item a:link,
+ div.table_of_contents_item a:visited,
+ div.table_of_contents_item a:active {
+ color: #000000;
+ }
+
+ div.table_of_contents_item a:hover {
+ background-color: #000000;
+
+ color: #FFFFFF;
+ }
+
+ div.content_section_text a:link,
+ div.content_section_text a:visited,
+ div.content_section_text a:active {
+ background-color: #DCDFE6;
+
+ color: #000000;
+ }
+
+ div.content_section_text a:hover {
+ background-color: #000000;
+
+ color: #DCDFE6;
+ }
+
+ div.validator {
+ }
+ </style>
+ </head>
+ <body>
+ <div class="main_page">
+ <div class="page_header floating_element">
+ <img src="/icons/trisquel-logo.png" alt="Trisquel Logo" class="floating_element"/>
+ <span class="floating_element">
+ Trisquel Default Page for Apache2
+ </span>
+ </div>
+<!-- <div class="table_of_contents floating_element">
+ <div class="section_header section_header_grey">
+ TABLE OF CONTENTS
+ </div>
+ <div class="table_of_contents_item floating_element">
+ <a href="#about">About</a>
+ </div>
+ <div class="table_of_contents_item floating_element">
+ <a href="#changes">Changes</a>
+ </div>
+ <div class="table_of_contents_item floating_element">
+ <a href="#scope">Scope</a>
+ </div>
+ <div class="table_of_contents_item floating_element">
+ <a href="#files">Config files</a>
+ </div>
+ </div>
+-->
+ <div class="content_section floating_element">
+
+
+ <div class="section_header section_header_blue">
+ <div id="about"></div>
+ It works!
+ </div>
+ <div class="content_section_text">
+ <p>
+ This is the default welcome page used to test the correct
+ operation of the Apache2 server after installation on Trisquel systems.
+ It is based on the equivalent page on Debian, from which the Trisquel Apache
+ packaging is derived.
+ If you can read this page, it means that the Apache HTTP server installed at
+ this site is working properly. You should <b>replace this file</b> (located at
+ <tt>/var/www/html/index.html</tt>) before continuing to operate your HTTP server.
+ </p>
+
+
+ <p>
+ If you are a normal user of this web site and don't know what this page is
+ about, this probably means that the site is currently unavailable due to
+ maintenance.
+ If the problem persists, please contact the site's administrator.
+ </p>
+
+ </div>
+ <div class="section_header">
+ <div id="changes"></div>
+ Configuration Overview
+ </div>
+ <div class="content_section_text">
+ <p>
+ Trisquel's Apache2 default configuration is different from the
+ upstream default configuration, and split into several files optimized for
+ interaction with Trisquel tools. The configuration system is
+ <b>fully documented in
+ /usr/share/doc/apache2/README.Debian.gz</b>. Refer to this for the full
+ documentation. Documentation for the web server itself can be
+ found by accessing the <a href="/manual">manual</a> if the <tt>apache2-doc</tt>
+ package was installed on this server.
+
+ </p>
+ <p>
+ The configuration layout for an Apache2 web server installation on Trisquel systems is as follows:
+ </p>
+ <pre>
+/etc/apache2/
+|-- apache2.conf
+| `-- ports.conf
+|-- mods-enabled
+| |-- *.load
+| `-- *.conf
+|-- conf-enabled
+| `-- *.conf
+|-- sites-enabled
+| `-- *.conf
+ </pre>
+ <ul>
+ <li>
+ <tt>apache2.conf</tt> is the main configuration
+ file. It puts the pieces together by including all remaining configuration
+ files when starting up the web server.
+ </li>
+
+ <li>
+ <tt>ports.conf</tt> is always included from the
+ main configuration file. It is used to determine the listening ports for
+ incoming connections, and this file can be customized anytime.
+ </li>
+
+ <li>
+ Configuration files in the <tt>mods-enabled/</tt>,
+ <tt>conf-enabled/</tt> and <tt>sites-enabled/</tt> directories contain
+ particular configuration snippets which manage modules, global configuration
+ fragments, or virtual host configurations, respectively.
+ </li>
+
+ <li>
+ They are activated by symlinking available
+ configuration files from their respective
+ *-available/ counterparts. These should be managed
+ by using our helpers
+ <tt>
+ <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2enmod">a2enmod</a>,
+ <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2dismod">a2dismod</a>,
+ </tt>
+ <tt>
+ <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2ensite">a2ensite</a>,
+ <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2dissite">a2dissite</a>,
+ </tt>
+ and
+ <tt>
+ <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2enconf">a2enconf</a>,
+ <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2disconf">a2disconf</a>
+ </tt>. See their respective man pages for detailed information.
+ </li>
+
+ <li>
+ The binary is called apache2. Due to the use of
+ environment variables, in the default configuration, apache2 needs to be
+ started/stopped with <tt>/etc/init.d/apache2</tt> or <tt>apache2ctl</tt>.
+ <b>Calling <tt>/usr/bin/apache2</tt> directly will not work</b> with the
+ default configuration.
+ </li>
+ </ul>
+ </div>
+
+ <div class="section_header">
+ <div id="docroot"></div>
+ Document Roots
+ </div>
+
+ <div class="content_section_text">
+ <p>
+ By default, Trisquel does not allow access through the web browser to
+ <em>any</em> file apart of those located in <tt>/var/www</tt>,
+ <a href="http://httpd.apache.org/docs/2.4/mod/mod_userdir.html">public_html</a>
+ directories (when enabled) and <tt>/usr/share</tt> (for web
+ applications). If your site is using a web document root
+ located elsewhere (such as in <tt>/srv</tt>) you may need to whitelist your
+ document root directory in <tt>/etc/apache2/apache2.conf</tt>.
+ </p>
+ <p>
+ The default Trisquel document root is <tt>/var/www/html</tt>. You
+ can make your own virtual hosts under /var/www. This is different
+ to previous releases which provides better security out of the box.
+ </p>
+ </div>
+
+
+
+
+ </div>
+ </div>
+ </body>
+</html>
+
diff --git a/helpers/DATA/apache2/trisquel-logo.png b/helpers/DATA/apache2/trisquel-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..212f4d71b75450ba983eb94714cb2d56d4a3e759
Binary files /dev/null and b/helpers/DATA/apache2/trisquel-logo.png differ
diff --git a/helpers/make-apache2 b/helpers/make-apache2
index 785f944cc62f7bd60612cf57e5f975e11ae3f73a..ecd8801cc4a576ca31cf4e17c338ed96321e6ea2 100644
--- a/helpers/make-apache2
+++ b/helpers/make-apache2
@@ -17,10 +17,15 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=1
+VERSION=2
. ./config
+rm debian/icons/ubuntu-logo.png
+cp $DATA/trisquel-logo.png debian/icons/
+cp $DATA/index.html debian/
+replace ubuntu-logo trisquel-logo .
+
# Make the banner be Trisquel GNU/Linux instead of just Trisquel
sed '/^LSB_RELEASE/s/$/_GNU\/Linux/' -i debian/rules