diff --git a/oracle-docs.perl b/oracle-docs.perl
index 8ed2a09..5dd3ecb 100644
--- a/oracle-docs.perl
+++ b/oracle-docs.perl
@@ -3,54 +3,53 @@
 # Basic script for generating XML markup for the major sections of the Oracle Documentation, and XSLT templates (and meta-templates, for both output formats) for transforming it.
 # 
 # To do:
-#  * Maybe modify the script to work for any URL-based hyperlinks (e.g. <Blackboard/>, <OtagoUniversity/>).  This would mean ditching the automatic "Ora" prefix, but wouldn't require much else to implement.
 #  * Generalise so that the LaTeX output is split to use a separate hyperlink for each word in the link label (to allow the links to be wrapped across lines).  HTML version doesn't need to be changed.
  
 
-# I figure this is also a sensible place to store the root of the Oracle documentation on the department's Web server.
-# Should this have a trailing slash (appropriate for standalone URL) or not (appropriate for a prefix for composite URLs)?
-$oracle_documentation_root = "http://info-nts-12.otago.ac.nz/docs/oracle11gr1/";
+$oracle_documentation_root = 'https://docs.oracle.com/cd/E11882_01/';
 
 
 # Here's the raw data.
 # Each entry has a name (marked up as XML), a unique, short, space-less code name for it, and the actual URL.
-# It's probably sensible to have the full URL here, rather than prefixing the Oracle document root, because it's easier to copy the entire URL from the Web browser when updating.
+# It makes more sense to have the full URL here, rather than prefixing the Oracle document root, because it's easier to copy the entire URL from the Web browser when updating.
 %references =
 (
     Docs => { name => 'Database Documentation Library',
-              url => $oracle_documentation_root },
+              url => 'https://docs.oracle.com/cd/E11882_01/nav/portal_booklist.htm' },
     Admin => { name => 'Database Administrator<apostrophe />s Guide',
-               url => $oracle_documentation_root . 'server.111/b28310/toc.htm' },
-    AppDev2Day => { name => 'Database 2 Day Developer<apostrophe />s Guide',
-                    url => $oracle_documentation_root . 'appdev.111/b28843/toc.htm' },
+               url => 'https://docs.oracle.com/cd/E11882_01/server.112/e25494/toc.htm' },
+#     AppDev2Day => { name => 'Database 2 Day Developer<apostrophe />s Guide',
+#                     url => 'https://docs.oracle.com/cd/E11882_01/appdev.112/b28843/toc.htm' },
     AppDevAdv => { name => 'Database Advanced Application Developer<apostrophe />s Guide',
-                   url => $oracle_documentation_root . 'appdev.111/b28424/toc.htm' },
+                   url => 'https://docs.oracle.com/cd/E11882_01/appdev.112/e41502/toc.htm' },
     AppDevOR => { name => 'Object-Relational Developer<apostrophe />s Guide',
-                  url => $oracle_documentation_root . 'appdev.111/b28371/toc.htm' },
+                  url => 'https://docs.oracle.com/cd/E11882_01/appdev.112/e11822/toc.htm' },
     Concepts => { name => 'Database Concepts',
-                  url => $oracle_documentation_root . 'server.111/b28318/toc.htm' },
+                  url => 'https://docs.oracle.com/cd/E11882_01/server.112/e40540/toc.htm' },
     DataWarehousing => { name => 'Database Data Warehousing Guide',
-                         url => $oracle_documentation_root . 'server.111/b28313/toc.htm' },
+                         url => 'https://docs.oracle.com/cd/E11882_01/server.112/e25554/toc.htm' },
     Errors => { name => 'Database Error Messages',
-                url => $oracle_documentation_root . 'server.111/b28278/toc.htm' },
+                url => 'https://docs.oracle.com/cd/E11882_01/server.112/e17766/toc.htm' },
     SQL => { name => 'Database SQL Language Reference',
-             url => $oracle_documentation_root . 'server.111/b28286/toc.htm' },
+             url => 'https://docs.oracle.com/cd/E11882_01/server.112/e41084/toc.htm' },
     Java => { name => 'Database Java Developer<apostrophe />s Guide',
-              url => $oracle_documentation_root . 'java.111/b31225/toc.htm' },
-    JDBC => { name => 'Database JDBC Developer<apostrophe />s Guide and Reference',
-              url => $oracle_documentation_root . 'java.111/b31224/toc.htm' },
-    Glossary => { name => 'Database Master Glossary',
-                  url => $oracle_documentation_root . 'mix.111/b14388/toc.htm' },
+              url => 'https://docs.oracle.com/cd/E11882_01/java.112/e10588/toc.htm' },
+    JDBC => { name => 'Database JDBC Developer<apostrophe />s Guide',
+              url => 'https://docs.oracle.com/cd/E11882_01/java.112/e16548/toc.htm' },
+    JDBCRef => { name => 'Database JDBC Java API Reference (Javadoc)',
+              url => 'https://docs.oracle.com/cd/E11882_01/Database JDBC Java API Reference (Javadoc)' },
+#     Glossary => { name => 'Database Master Glossary',
+#                   url => 'https://docs.oracle.com/cd/E11882_01/mix.112/b14388/toc.htm' },
     Tuning => { name => 'Database Performance Tuning Guide',
-                url => $oracle_documentation_root . 'server.111/b28274/toc.htm' },
+                url => 'https://docs.oracle.com/cd/E11882_01/e41573/toc.htm' },
     PLSQL => { name => 'Database PL/SQL Language Reference',
-               url => $oracle_documentation_root . 'appdev.111/b28370/toc.htm' },
+               url => 'https://docs.oracle.com/cd/E11882_01/e25519/toc.htm' },
     PLSQLPkgTyp => { name => 'Database PL/SQL Packages and Types Reference',
-                     url => $oracle_documentation_root . 'appdev.111/b28419/toc.htm' },
-    Index => { name => 'Database Master Index',
-               url => $oracle_documentation_root . 'mix.111/b14387/toc.htm' },
+                     url => 'https://docs.oracle.com/cd/E11882_01/e40758/toc.htm' },
+#     Index => { name => 'Database Master Index',
+#                url => 'https://docs.oracle.com/cd/E11882_01/mix.112/b14387/toc.htm' },
     Reference => { name => 'Database Reference',
-                   url => $oracle_documentation_root . 'server.111/b28320/toc.htm' },
+                   url => 'https://docs.oracle.com/cd/E11882_01/e40402/toc.htm' },
 );
 
 # Prefix to use in the generated template names: