diff --git a/common/files/sources.list b/common/files/sources.list-jessie
similarity index 100%
rename from common/files/sources.list
rename to common/files/sources.list-jessie
diff --git a/common/files/sources.list-stretch b/common/files/sources.list-stretch
new file mode 100644
index 0000000000000000000000000000000000000000..2f37e7d71040bd542b6c1a9071e75965df84e378
--- /dev/null
+++ b/common/files/sources.list-stretch
@@ -0,0 +1,13 @@
+deb http://ftp.halifax.rwth-aachen.de/debian/ stretch main
+deb-src http://ftp.halifax.rwth-aachen.de/debian/ stretch main
+
+deb http://security.debian.org/ stretch/updates main
+deb-src http://security.debian.org/ stretch/updates main
+
+# stretch-updates, previously known as 'volatile'
+deb http://ftp.halifax.rwth-aachen.de/debian/ stretch-updates main
+deb-src http://ftp.halifax.rwth-aachen.de/debian/ stretch-updates main
+
+# stretch-backports, previously on backports.debian.org
+deb http://ftp.halifax.rwth-aachen.de/debian/ stretch-backports main
+deb-src http://ftp.halifax.rwth-aachen.de/debian/ stretch-backports main
diff --git a/common/tasks/repositories.yml b/common/tasks/repositories.yml
index fb781311ec343cf36321048bc0e6c5e33ee0dd55..54dc5e3133a05c4937ce3ba67ec483e5faa29dff 100644
--- a/common/tasks/repositories.yml
+++ b/common/tasks/repositories.yml
@@ -2,43 +2,43 @@
 # file: roles/common/tasks/repositories.yml
 
 - name: provide default sources.list
-  copy: src=sources.list dest=/etc/apt/sources.list owner=root group=root mode=0644
+  copy: src="sources.list-{{debian_version}}" dest=/etc/apt/sources.list owner=root group=root mode=0644
   tags:
     - packages
     - repos
 
 - name: add contrib and non-free
-  apt_repository: repo='deb http://ftp.halifax.rwth-aachen.de/debian jessie contrib non-free' state=present
+  apt_repository: repo='deb http://ftp.halifax.rwth-aachen.de/debian {{debian_version}} contrib non-free' state=present
   tags:
     - packages
     - repos
 
 - name: add contrib security
-  apt_repository: repo='deb http://security.debian.org/ jessie/updates contrib' state=present
+  apt_repository: repo='deb http://security.debian.org/ {{debian_version}}/updates contrib' state=present
   tags:
     - packages
     - repos
 
 - name: add contrib and non-free updates
-  apt_repository: repo='deb http://ftp.halifax.rwth-aachen.de/debian/ jessie-updates contrib non-free' state=present
+  apt_repository: repo='deb http://ftp.halifax.rwth-aachen.de/debian/ {{debian_version}}-updates contrib non-free' state=present
   tags:
     - packages
     - repos
 
 - name: add contrib and non-free source
-  apt_repository: repo='deb-src http://ftp.halifax.rwth-aachen.de/debian jessie contrib non-free' state=present
+  apt_repository: repo='deb-src http://ftp.halifax.rwth-aachen.de/debian {{debian_version}} contrib non-free' state=present
   tags:
     - packages
     - repos
 
 - name: add contrib security source
-  apt_repository: repo='deb-src http://security.debian.org/ jessie/updates contrib' state=present
+  apt_repository: repo='deb-src http://security.debian.org/ {{debian_version}}/updates contrib' state=present
   tags:
     - packages
     - repos
 
 - name: add contrib and non-free updates source
-  apt_repository: repo='deb-src http://ftp.halifax.rwth-aachen.de/debian/ jessie-updates contrib non-free' state=present
+  apt_repository: repo='deb-src http://ftp.halifax.rwth-aachen.de/debian/ {{debian_version}}-updates contrib non-free' state=present
   tags:
     - packages
     - repos
diff --git a/texlive/tasks/main.yml b/texlive/tasks/main.yml
index 3f8237fdfaa28b95811da3c50c765665cb2ae1ac..294acdf7afa70fc7829b9019ee7591acdaa05f11 100644
--- a/texlive/tasks/main.yml
+++ b/texlive/tasks/main.yml
@@ -23,7 +23,6 @@
 - name: ensure some texlive recommandations are installed
   apt: name={{ item }} state=latest install_recommends=no
   with_items:
-    - fonts-droid 
     - ghostscript 
     - lmodern 
     - texlive-fonts-recommended-doc 
@@ -49,6 +48,23 @@
     - texlive
     - packages
 
+- name: ensure some texlive recommandations are installed for jessie
+  apt: name={{ item }} state=latest install_recommends=no
+  with_items:
+    - fonts-droid 
+  when: debian_version == "jessie"
+  tags:
+    - texlive
+    - packages
+
+- name: ensure some texlive recommandations are installed for stretch
+  apt: name={{ item }} state=latest install_recommends=no
+  with_items:
+    - fonts-droid-fallback
+  when: debian_version == "stretch"
+  tags:
+    - texlive
+    - packages
 
 #- name: figure out if texlive is installed
 #  command: dpkg -L texlive-full