diff --git a/README.md b/README.md
index f49ec4b8d98ee..c557716a4a88b 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ Major components of the project include:
  - [Gandiva](https://github.com/apache/arrow/tree/main/cpp/src/gandiva):
    an [LLVM](https://llvm.org)-based Arrow expression compiler, part of the C++ codebase
  - [Go libraries](https://github.com/apache/arrow-go)
- - [Java libraries](https://github.com/apache/arrow/tree/main/java)
+ - [Java libraries](https://github.com/apache/arrow-java)
  - [JavaScript libraries](https://github.com/apache/arrow/tree/main/js)
  - [Python libraries](https://github.com/apache/arrow/tree/main/python)
  - [R libraries](https://github.com/apache/arrow/tree/main/r)
diff --git a/docs/source/developers/guide/step_by_step/arrow_codebase.rst b/docs/source/developers/guide/step_by_step/arrow_codebase.rst
index c4ea61d89ff80..ddd4266dbd324 100644
--- a/docs/source/developers/guide/step_by_step/arrow_codebase.rst
+++ b/docs/source/developers/guide/step_by_step/arrow_codebase.rst
@@ -32,15 +32,18 @@ Working on the Arrow codebase 🧐
 Finding your way around Arrow
 =============================
 
-The Apache Arrow repository includes implementations for
-most of the libraries for which Arrow is available.
+The `Apache Arrow repository <https://github.com/apache/arrow>`_ includes
+implementations for most of the libraries for which Arrow is available.
 
 Languages like GLib (``c_glib/``), C++ (``cpp/``), C# (``csharp/``),
-Go (``go/``), Java (``java/``), JavaScript (``js/``), MATLAB
-(``matlab/``), Python (``python/``), R (``r/``) and Ruby (``ruby/``)
-have their own subdirectories in the main folder as written here.
+JavaScript (``js/``), MATLAB (``matlab/``), Python (``python/``), R (``r/``)
+and Ruby (``ruby/``) have their own subdirectories in the main folder as written here.
 
-Rust has its own repository available `here <https://github.com/apache/arrow-rs>`_.
+The following language implementations have their own repositories:
+
+- `Rust <https://github.com/apache/arrow-rs>`_
+- `Go <https://github.com/apache/arrow-go>`_
+- `Java <https://github.com/apache/arrow-java>`_
 
 In the **language-specific subdirectories** you can find the code
 connected to that language. For example: