diff --git a/roles/minecraft/tasks/main.yml b/roles/minecraft/tasks/main.yml
index a5600b7..eb6c6b5 100644
--- a/roles/minecraft/tasks/main.yml
+++ b/roles/minecraft/tasks/main.yml
@@ -105,11 +105,22 @@
               - "--installServer"
           args:
             creates: "/var/minecraft/{{ mcname }}/forge-{{ mcforge }}-universal.jar"
-        - name: Link server jar
+        - name: Find classic jar name
+          stat:
+            path: "/var/minecraft/{{ mcname }}/forge-{{ mcforge }}-universal.jar"
+          register: stat_mcroot_newjar
+        - name: Link old-style server jar
           file:
             path: "/var/minecraft/{{ mcname }}/server.jar"
             src: "/var/minecraft/{{ mcname }}/forge-{{ mcforge }}-universal.jar"
             state: link
+          when: stat_mcroot_newjar.stat.exists
+        - name: Link new-style server jar
+          file:
+            path: "/var/minecraft/{{ mcname }}/server.jar"
+            src: "/var/minecraft/{{ mcname }}/forge-{{ mcforge }}.jar"
+            state: link
+          when: not stat_mcroot_newjar.stat.exists
       when: not stat_mcroot_forgejar.stat.exists
     - name: Configure server
       block: