diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index b4f811cf93a4e36b9c479dcc3350654abfc71edd..64ca89f87bc26c04ae61ba675f44511ceb5184a7 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1603,8 +1603,16 @@ (define-public icedtea-8
           ,(drop "langtools"
                  "15wizy123vhk40chl1b4p552jf2pw2hdww0myf11qab425axz4nw"))
          ("hotspot-drop"
-          ,(drop "hotspot"
-                 "1ciz1w9j0kz7s1dxdhyqq71nla9icyz6qvn0b9z2zgkklqa98qmm"))
+          ,(origin
+             (method url-fetch)
+             (uri (string-append
+                   "http://icedtea.classpath.org/download/drops"
+                   "/icedtea8/" version "/hotspot.tar.xz"))
+             (sha256
+              (base32
+               "1ciz1w9j0kz7s1dxdhyqq71nla9icyz6qvn0b9z2zgkklqa98qmm"))
+             (patches (search-patches
+                       "icedtea-7-hotspot-gcc-segfault-workaround.patch"))))
          ("nashorn-drop"
           ,(drop "nashorn"
                  "19pzl3ppaw8j6r5cnyp8qiw3hxijh3hdc46l39g5yfhdl4pr4hpa"))