diff --git a/README.rst b/README.rst
index aa755940ea..4545b9ce78 100644
--- a/README.rst
+++ b/README.rst
@@ -53,9 +53,7 @@ Bug tracker:
 
 Source code:
 
-* Official `Apache Subversion repo`_ at apache.org
-* `ViewVC repo browser`_ at apache.org
-* `GitHub git mirror`_ at github.com
+* Official `Apache Git repo`_ at apache.org
 
 Requires Java 1.8 or later.
 
@@ -100,7 +98,5 @@ To build the jar files for poi, poi-ooxml, poi-ooxml-lite, poi-ooxml-full and po
 .. _Bugzilla: https://bz.apache.org/bugzilla/buglist.cgi?product=POI
 .. _GitHub pull requests: https://github.com/apache/poi/pulls
 
-.. _Apache Subversion repo: https://svn.apache.org/repos/asf/poi/trunk
-.. _ViewVC repo browser: https://svn.apache.org/viewvc/poi/trunk
-.. _GitHub git mirror: https://github.com/apache/poi
+.. _Apache Git repo: https://github.com/apache/poi
 .. _How To Build page: http://poi.apache.org/devel/
diff --git a/doap_POI.rdf b/doap_POI.rdf
index f1065b1ab6..b80b14848b 100644
--- a/doap_POI.rdf
+++ b/doap_POI.rdf
@@ -253,10 +253,10 @@
       </Version>
     </release>
     <repository>
-      <SVNRepository>
-        <location rdf:resource="https://svn.apache.org/repos/asf/poi/"/>
-        <browse rdf:resource="https://svn.apache.org/viewvc/poi/"/>
-      </SVNRepository>
+      <GitRepository>
+        <location rdf:resource="https://github.com/apache/poi.git"/>
+        <browse rdf:resource="https://github.com/apache/poi/"/>
+      </GitRepository>
     </repository>
    <maintainer>
       <foaf:Person>
diff --git a/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/UpdateEmbeddedDoc.java b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/UpdateEmbeddedDoc.java
index faf31b3ded..96a24f591d 100644
--- a/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/UpdateEmbeddedDoc.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/UpdateEmbeddedDoc.java
@@ -44,7 +44,7 @@ import org.apache.poi.xwpf.usermodel.XWPFDocument;
  * SpreadsheetML workbook embedded into the document.<p>
  *
  * This code was successfully tested with the following file from the POI test collection:
- * http://svn.apache.org/repos/asf/poi/trunk/test-data/document/EmbeddedDocument.docx
+ * test-data/document/EmbeddedDocument.docx
  */
 @SuppressWarnings({"java:S106","java:S4823","java:S1192"})
 public class UpdateEmbeddedDoc {
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java
index 50f87b0d5b..76c966f8bd 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java
@@ -947,7 +947,7 @@ public class SXSSFCell extends CellBase {
         }
     }
 
-//COPIED FROM https://svn.apache.org/repos/asf/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCell.java since the functions are declared private there
+//COPIED FROM XSSFCell.java since the functions are declared private there
     /**
      * Used to help format error messages
      */
diff --git a/poi/src/main/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java b/poi/src/main/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
index f9af178a5a..aa58173db6 100644
--- a/poi/src/main/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
+++ b/poi/src/main/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
@@ -58,7 +58,7 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
  *  the XLS2CSVmra example
  * </p>
  *
- * @see <a href="http://svn.apache.org/repos/asf/poi/trunk/src/examples/src/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java">XLS2CSVmra</a>
+ * @see <a href="https://github.com/apache/poi/blob/trunk/poi-examples/src/main/java/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java">XLS2CSVmra</a>
  */
 public class EventBasedExcelExtractor implements POIOLE2TextExtractor, org.apache.poi.ss.extractor.ExcelExtractor {
     private final POIFSFileSystem poifs;
diff --git a/poi/src/main/java/org/apache/poi/hssf/extractor/ExcelExtractor.java b/poi/src/main/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
index 3f413b0643..fc0e7aa43c 100644
--- a/poi/src/main/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
+++ b/poi/src/main/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
@@ -51,7 +51,7 @@ import org.apache.poi.ss.usermodel.Row.MissingCellPolicy;
  *  the XLS2CSVmra example
  * </p>
  *
- * @see <a href="http://svn.apache.org/repos/asf/poi/trunk/poi-examples/src/main/java/org/apache/poi/hssf/eventusermodel/examples/XLS2CSVmra.java">XLS2CSVmra</a>
+ * @see <a href="https://github.com/apache/poi/blob/trunk/poi-examples/src/main/java/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java">XLS2CSVmra</a>
  */
 public class ExcelExtractor implements POIOLE2TextExtractor, org.apache.poi.ss.extractor.ExcelExtractor {
     private final HSSFWorkbook _wb;