diff --git a/map-desktop-category.sh b/map-desktop-category.sh
index 36e01c2..af9b37a 100644
--- a/map-desktop-category.sh
+++ b/map-desktop-category.sh
@@ -94,10 +94,14 @@ function mapCategory() {
     Design)
        ret="X-SuSE-$in";;
 #Graphics Menu:
-    3DGraphics|Photography|Scanning|OCR|VectorGraphics|RasterGraphics|2DGraphics|Maps) ret=$in ;;
+    3DGraphics|Photography|Scanning|OCR|VectorGraphics|RasterGraphics|2DGraphics|Maps| \
+    Publishing|Viewer) ret=$in ;;
 #Education and Science Menu:
     Teaching|Math|Chemistry|Astronomy|Art|Construction|Languages| \
-    Engineering|Geography|Spirituality|Humanities) ret=$in ;;
+    Engineering|Geography|Spirituality|Humanities|ArtificialIntelligence| \
+    DataVisualization|Economy|Electricity|Geology|Geoscience|History|ImageProcessing| \
+    Literature|MedicalSoftware|NumericalAnalysis|ParallelComputing|Physics|Robotics| \
+    Sports|Biology) ret=$in ;;
 #Multimedia Menu:
     AudioVideoEditing|Music|DiscBurning|Mixer|Player|Midi|Sequencer| \
     TV|Tuner|Recorder|Video) ret=$in ;;
@@ -130,7 +134,7 @@ function mapCategory() {
     Application|Qt|KDE|GTK|GNOME|XFCE|Motif|ConsoleOnly|Shell|X-Red-*| \
     X-Ximian-*|X-GNOME-*|X-KDE-*|Settings|DesktopSettings|HardwareSettings| \
     Office|Network|Game|Graphics|Education|Documentation|Development| \
-    Viewer|Science|System|Utility|AudioVideo|AdvancedSettings|More) ret=$in ;;
+    Science|System|Utility|AudioVideo|AdvancedSettings|More) ret=$in ;;
     Core-Edutainment|Core-Game|Core-Graphics|Core-Internet| \
     Core-Multimedia|Core-Office|Core-Settings|Core-Utility|Core-System| \
     Core-Configuration|Core-Development|core)
diff --git a/update-desktop-files.changes b/update-desktop-files.changes
index 43b12a4..97ceaeb 100644
--- a/update-desktop-files.changes
+++ b/update-desktop-files.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 20 12:21:36 UTC 2018 - fvogt@suse.com
+
+- Update map-desktop-category.sh to include updated Education, Science
+  and Graphics categories (boo#1074711)
+
 -------------------------------------------------------------------
 Thu Mar 15 10:53:08 UTC 2018 - lnussel@suse.de
 
diff --git a/update-desktop-files.spec b/update-desktop-files.spec
index 29b3353..5e8f6db 100644
--- a/update-desktop-files.spec
+++ b/update-desktop-files.spec
@@ -20,7 +20,7 @@ Name:           update-desktop-files
 Version:        84.87
 Release:        0
 Summary:        A Build Tool to Update Desktop Files
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Development/Tools/Building
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         suse_update_desktop_file.sh