diff --git a/doc/Makefile b/docs/Makefile
similarity index 100%
rename from doc/Makefile
rename to docs/Makefile
diff --git a/doc/make.bat b/docs/make.bat
similarity index 100%
rename from doc/make.bat
rename to docs/make.bat
diff --git a/doc/source/_static/.placeholder b/docs/source/_static/.placeholder
similarity index 100%
rename from doc/source/_static/.placeholder
rename to docs/source/_static/.placeholder
diff --git a/doc/source/api/diffpy.pdffit2.rst b/docs/source/api/diffpy.pdffit2.rst
similarity index 100%
rename from doc/source/api/diffpy.pdffit2.rst
rename to docs/source/api/diffpy.pdffit2.rst
diff --git a/doc/source/conf.py b/docs/source/conf.py
similarity index 100%
rename from doc/source/conf.py
rename to docs/source/conf.py
diff --git a/doc/source/examples.rst b/docs/source/examples.rst
similarity index 100%
rename from doc/source/examples.rst
rename to docs/source/examples.rst
diff --git a/doc/source/examples/Ni-xray.gr b/docs/source/examples/Ni-xray.gr
similarity index 100%
rename from doc/source/examples/Ni-xray.gr
rename to docs/source/examples/Ni-xray.gr
diff --git a/doc/source/examples/Ni.stru b/docs/source/examples/Ni.stru
similarity index 100%
rename from doc/source/examples/Ni.stru
rename to docs/source/examples/Ni.stru
diff --git a/doc/source/examples/Ni_calculation.py b/docs/source/examples/Ni_calculation.py
similarity index 100%
rename from doc/source/examples/Ni_calculation.py
rename to docs/source/examples/Ni_calculation.py
diff --git a/doc/source/examples/Ni_refinement.py b/docs/source/examples/Ni_refinement.py
similarity index 100%
rename from doc/source/examples/Ni_refinement.py
rename to docs/source/examples/Ni_refinement.py
diff --git a/doc/source/index.rst b/docs/source/index.rst
similarity index 100%
rename from doc/source/index.rst
rename to docs/source/index.rst
diff --git a/doc/source/license.rst b/docs/source/license.rst
similarity index 100%
rename from doc/source/license.rst
rename to docs/source/license.rst
diff --git a/doc/source/release.rst b/docs/source/release.rst
similarity index 100%
rename from doc/source/release.rst
rename to docs/source/release.rst
diff --git a/news/build.rst b/news/build.rst
new file mode 100644
index 00000000..3e18e755
--- /dev/null
+++ b/news/build.rst
@@ -0,0 +1,24 @@
+**Added:**
+
+* Add gsl to conda requirements.
+
+**Changed:**
+
+* Remove mac static GSL linking; always link to shared GSL.
+* Change doc to docs for skpkg standard.
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>
diff --git a/requirements/conda.txt b/requirements/conda.txt
index 9cc306b0..0668b5ee 100644
--- a/requirements/conda.txt
+++ b/requirements/conda.txt
@@ -1 +1,2 @@
 diffpy.structure
+gsl
diff --git a/requirements/test.txt b/requirements/tests.txt
similarity index 100%
rename from requirements/test.txt
rename to requirements/tests.txt
diff --git a/setup.py b/setup.py
index 57e28713..9a334a8e 100644
--- a/setup.py
+++ b/setup.py
@@ -157,11 +157,7 @@ def create_extensions():
     except EnvironmentError:
         return []
 
-    # On macOS, dynamic linking may not be needed
-    if sys.platform == "darwin":
-        libraries = []
-    else:
-        libraries = ["gsl"]
+    libraries = ["gsl"]
 
     include_dirs = [MYDIR] + gcfg["include_dirs"]
     library_dirs = gcfg["library_dirs"]
@@ -180,16 +176,6 @@ def create_extensions():
             "-funroll-loops",
             "-ffast-math",
         ]
-        # Check for static GSL libraries and add them if found.
-        static_libs = [
-            os.path.join(p, "libgsl.a")
-            for p in gcfg["library_dirs"]
-            if os.path.isfile(os.path.join(p, "libgsl.a"))
-        ]
-        if static_libs:
-            extra_objects += static_libs
-            # Use static linking: remove "-lgsl" to avoid dynamic linking conflicts.
-            libraries = []
     elif compiler_type == "msvc":
         define_macros += [("_USE_MATH_DEFINES", None)]
         extra_compile_args = ["/EHs"]