diff --git a/NEWS b/NEWS
index b95087a..9674872 100644
--- a/NEWS
+++ b/NEWS
@@ -241,7 +241,7 @@ libxkbcommon 0.4.1 - 2014-03-27
   is converted to an appropriate control character.
   This matches the behavior of libX11's XLookupString(3), and
   required by the XKB specification:
-  http://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Control_Modifier
+  https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Control_Modifier
 
   https://bugs.freedesktop.org/show_bug.cgi?id=75892
 
@@ -304,7 +304,7 @@ libxkbcommon 0.3.2 - 2013-11-22
 - Apply capitalization transformation on keysyms in
   xkb_keysym_get_one_sym(), to match the behavior specified in the XKB
   specification:
-  http://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Lock_Modifier
+  https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Lock_Modifier
 
 - Support byacc for generating the parser, in addition to Bison.
 
diff --git a/README.md b/README.md
index 358e7d7..b8ae50d 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ While libxkbcommon's API is somewhat derived from the classic XKB API as found
 in X11/extensions/XKB.h and friends, it has been substantially reworked to
 expose fewer internal details to clients.
 
-See the [API Documentation](http://xkbcommon.org/doc/current/modules.html).
+See the [API Documentation](https://xkbcommon.org/doc/current/modules.html).
 
 ## Dataset
 
@@ -39,7 +39,7 @@ libxkbcommon does not distribute a keymap dataset itself, other than for
 testing purposes.  The most common dataset is xkeyboard-config, which is used
 by all current distributions for their X11 XKB data.  More information on
 xkeyboard-config is available here:
-    http://www.freedesktop.org/wiki/Software/XKeyboardConfig
+    https://www.freedesktop.org/wiki/Software/XKeyboardConfig
 
 The dataset for Compose is distributed in libX11, as part of the X locale
 data.
@@ -51,7 +51,7 @@ See [Compatibility](doc/compat.md) notes.
 ## Development
 
 An extremely rudimentary homepage can be found at
-    http://xkbcommon.org
+    https://xkbcommon.org
 
 xkbcommon is maintained in git at
     https://github.com/xkbcommon/libxkbcommon
diff --git a/configure.ac b/configure.ac
index 394caa3..3ebab79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl Process this file with autoconf to create configure.
 AC_PREREQ([2.62])
 AC_INIT([libxkbcommon], [0.8.0],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=libxkbcommon],
-        [libxkbcommon], [http://xkbcommon.org])
+        [libxkbcommon], [https://xkbcommon.org])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([src/config.h])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/src/darray.h b/src/darray.h
index 5896d21..e9da974 100644
--- a/src/darray.h
+++ b/src/darray.h
@@ -23,7 +23,7 @@
 #ifndef CCAN_DARRAY_H
 #define CCAN_DARRAY_H
 
-/* Originally taken from: http://ccodearchive.net/info/darray.html
+/* Originally taken from: https://ccodearchive.net/info/darray.html
  * But modified for libxkbcommon. */
 
 #include <stdlib.h>
diff --git a/src/state.c b/src/state.c
index 6a88d96..16a4caa 100644
--- a/src/state.c
+++ b/src/state.c
@@ -876,7 +876,7 @@ err:
 }
 
 /*
- * http://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Lock_Modifier
+ * https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Lock_Modifier
  */
 static bool
 should_do_caps_transformation(struct xkb_state *state, xkb_keycode_t kc)
@@ -890,7 +890,7 @@ should_do_caps_transformation(struct xkb_state *state, xkb_keycode_t kc)
 }
 
 /*
- * http://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Control_Modifier
+ * https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Control_Modifier
  */
 static bool
 should_do_ctrl_transformation(struct xkb_state *state, xkb_keycode_t kc)
diff --git a/src/utf8.c b/src/utf8.c
index 11382c8..a7fa82e 100644
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -80,7 +80,7 @@ is_valid_utf8(const char *ss, size_t len)
 
     /* This beauty is from:
      *  The Unicode Standard Version 6.2 - Core Specification, Table 3.7
-     *  http://www.unicode.org/versions/Unicode6.2.0/ch03.pdf#G7404
+     *  https://www.unicode.org/versions/Unicode6.2.0/ch03.pdf#G7404
      * We can optimize if needed. */
     while (i < len)
     {
diff --git a/src/x11/keymap.c b/src/x11/keymap.c
index b469ef3..1642011 100644
--- a/src/x11/keymap.c
+++ b/src/x11/keymap.c
@@ -26,7 +26,7 @@
 /*
  * References for the lonesome traveler:
  * Xkb protocol specification:
- *      http://www.x.org/releases/current/doc/kbproto/xkbproto.html
+ *      https://www.x.org/releases/current/doc/kbproto/xkbproto.html
  * The XCB xkb XML protocol file:
  *      /user/share/xcb/xkb.xml
  * The XCB xkb header file:
diff --git a/test/utf8.c b/test/utf8.c
index 17c7156..60673c1 100644
--- a/test/utf8.c
+++ b/test/utf8.c
@@ -36,7 +36,7 @@ test_is_valid_utf8(void)
 {
     /*
      * Mostly taken from:
-     * http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
+     * https://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
      */
 
     VALID("ascii");
diff --git a/xkbcommon/xkbcommon-x11.h b/xkbcommon/xkbcommon-x11.h
index c3f5874..cf244d2 100644
--- a/xkbcommon/xkbcommon-x11.h
+++ b/xkbcommon/xkbcommon-x11.h
@@ -78,7 +78,7 @@ extern "C" {
  *
  * @note At this point, you may consider setting various XKB controls and
  * XKB per-client flags.  For example, enabling detectable autorepeat: \n
- * http://www.x.org/releases/current/doc/kbproto/xkbproto.html#Detectable_Autorepeat
+ * https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Detectable_Autorepeat
  *
  * Next, you need to react to state changes (e.g. a modifier was pressed,
  * the layout was changed) and to keymap changes (e.g. a tool like xkbcomp,
@@ -95,7 +95,7 @@ extern "C" {
  * @note It is also possible to use the KeyPress/KeyRelease @p state
  * field to find the effective modifier and layout state, instead of
  * using XkbStateNotify: \n
- * http://www.x.org/releases/current/doc/kbproto/xkbproto.html#Computing_A_State_Field_from_an_XKB_State
+ * https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Computing_A_State_Field_from_an_XKB_State
  * \n However, XkbStateNotify is more accurate.
  *
  * @note There is no need to call xkb_state_update_key(); the state is
diff --git a/xkbcommon/xkbcommon.h b/xkbcommon/xkbcommon.h
index 3e7a68d..f217471 100644
--- a/xkbcommon/xkbcommon.h
+++ b/xkbcommon/xkbcommon.h
@@ -177,7 +177,7 @@ typedef uint32_t xkb_keycode_t;
  * somewhat more general, in that they can also represent some "function",
  * such as "Left" or "Right" for the arrow keys.  For more information,
  * see:
- * http://www.x.org/releases/X11R7.7/doc/xproto/x11protocol.html#keysym_encoding
+ * https://www.x.org/releases/current/doc/xproto/x11protocol.html#keysym_encoding
  *
  * Specifically named keysyms can be found in the
  * xkbcommon/xkbcommon-keysyms.h header file.  Their name does not include
@@ -385,7 +385,7 @@ struct xkb_rule_names {
  *   Similarly, the UTF-8/UTF-32 string produced is capitalized.
  *
  *   This is described in:
- *   http://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Lock_Modifier
+ *   https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Lock_Modifier
  *
  * - Control transformation.  If the Control modifier is active and
  *   was not consumed by the translation process, the string produced
@@ -393,7 +393,7 @@ struct xkb_rule_names {
  *   applicable).  Keysyms are not affected.
  *
  *   This is described in:
- *   http://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Control_Modifier
+ *   https://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Control_Modifier
  *
  * Each relevant function discusses which transformations it performs.
  *