diff --git a/README.md b/README.md
index 95a1311731dc8ab317d4b448e0ddec59db3d3216..a473b44258e4488cb3a192d7df2fb9cf3d95573f 100644
--- a/README.md
+++ b/README.md
@@ -32,5 +32,5 @@ python-libevdev is licensed under the MIT license.
 > and/or sell copies of the Software, and to permit persons to whom the
 > Software is furnished to do so, subject to the following conditions: [...]
 
-See the [COPYING](http://github.com/whot/python-libevdev/blob/master/COPYING)
+See the [COPYING](https://gitlab.freedesktop.org/libevdev/python-libevdev/blob/master/COPYING)
 file for the full license information.
diff --git a/setup.py b/setup.py
index 7af003d96344be317bf2ceaf0de0a957c084827c..c655f558d2ce87a82c9944a632206f0df8edf42b 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 from distutils.core import setup
 
 long_description = '''
-python-libevdev is a Python wrapper arround the libevdev C library. It
+python-libevdev is a Python wrapper around the libevdev C library. It
 provides a Pythonic API to read events from the Linux kernel's input device
 nodes and to read and/or modify the device's state and capabilities.
 
@@ -17,7 +17,7 @@ setup(name='libevdev',
       long_description=long_description,
       author='Peter Hutterer',
       author_email='peter.hutterer@who-t.net',
-      url='https://www.github.com/whot/python-libevdev/',
+      url='https://gitlab.freedesktop.org/libevdev/python-libevdev',
       packages=['libevdev'],
       classifiers=[
            'Development Status :: 3 - Alpha',
@@ -27,4 +27,5 @@ setup(name='libevdev',
            'Programming Language :: Python :: 3',
           ],
       python_requires='>=3',
+      keywords='evdev input uinput libevdev',
 )