diff --git a/modules/desktop/files/etc/iceweasel/profile/prefs.js b/modules/desktop/files/etc/firefox-esr/profile/prefs.js
similarity index 100%
rename from modules/desktop/files/etc/iceweasel/profile/prefs.js
rename to modules/desktop/files/etc/firefox-esr/profile/prefs.js
diff --git a/modules/desktop/manifests/init.pp b/modules/desktop/manifests/init.pp
index 81a7813ba18c2911c6bd2d8c2a24ecd6e1d89576..e8bc33de5c549cd70262021b68b707fe8c8a57ce 100644
--- a/modules/desktop/manifests/init.pp
+++ b/modules/desktop/manifests/init.pp
@@ -34,8 +34,8 @@ class desktop {
 
 	$packages = [
 		'pcmanfm',
-		'iceweasel',
-		'iceweasel-l10n-*',
+		'firefox-esr',
+		'firefox-esr-l10n-*',
 		'gstreamer1.0-libav',
 		'gstreamer1.0-plugins-good',
 		'flashplugin-nonfree',
@@ -140,26 +140,30 @@ class desktop {
 		require => File['/etc/skel/Desktop/pcmanfm.desktop'],
 	}
 
-	file { '/etc/skel/Desktop/iceweasel.desktop':
-		source => '/usr/share/applications/iceweasel.desktop',
+	file { '/etc/skel/Desktop/firefox-esr.desktop':
+		source => '/usr/share/applications/firefox-esr.desktop',
 		replace => false,
 		require => [
-			Package['iceweasel'],
+			Package['firefox-esr'],
 			File['/etc/skel/Desktop'],
 		],
 	}
 
-	exec { 'fix-desktop-iceweasel':
-		command => '/bin/sed -i "/^Name/ s/=.*/=Webbrowser/;" /etc/skel/Desktop/iceweasel.desktop',
-		unless => '/bin/grep -q "^Name.*=Webbrowser" /etc/skel/Desktop/iceweasel.desktop',
-		require => File['/etc/skel/Desktop/iceweasel.desktop'],
+	exec { 'fix-desktop-firefox-esr':
+		command => '/bin/sed -i "/^Name/ s/=.*/=Webbrowser/;" /etc/skel/Desktop/firefox-esr.desktop',
+		unless => '/bin/grep -q "^Name.*=Webbrowser" /etc/skel/Desktop/firefox-esr.desktop',
+		require => File['/etc/skel/Desktop/firefox-esr.desktop'],
 	}
 
+	file { '/etc/firefox-esr/profile':
+		require => directory,
+	}
 
-	file { '/etc/iceweasel/profile/prefs.js':
-		source => 'puppet:///modules/desktop/etc/iceweasel/profile/prefs.js',
+	file { '/etc/firefox-esr/profile/prefs.js':
+		source => 'puppet:///modules/desktop/etc/firefox-esr/profile/prefs.js',
 		require => [
-			Package['iceweasel'],
+			Package['firefox-esr'],
+			File['/etc/firefox-esr/profile'],
 		],
 	}