diff --git a/README.md b/README.md
index d5a4c1d..f6e61b4 100644
--- a/README.md
+++ b/README.md
@@ -43,10 +43,11 @@ autostart=1   Automatically connect to server on launch (defaults to off).
 
 ## Authors
 
-This library was developed by Simon Eisenmann at [struktur AG](http://www.strukturag.com)
+This project was developed by Simon Eisenmann at [struktur AG](http://www.strukturag.com)
 
 ## License
 
+Copyright (C) 2018 Simon Eisenmann
 Copyright (C) 2012-2017 struktur AG
 
 Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/client/client.go b/client/client.go
index d3283d5..ca5e5a0 100644
--- a/client/client.go
+++ b/client/client.go
@@ -1,6 +1,6 @@
 /*
+ * Copyright (C) 2018 Simon Eisenmann
  * Copyright (C) 2014-2017 struktur AG
- * http://www.strukturag.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/client/static/css/base.css b/client/static/css/base.css
index 23f8f0e..6557327 100644
--- a/client/static/css/base.css
+++ b/client/static/css/base.css
@@ -1,6 +1,6 @@
 /*
+ * Copyright (C) 2018 Simon Eisenmann
  * Copyright (C) 2014-2017 struktur AG
- * http://www.strukturag.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/client/static/scripts/realtimetraffic.js b/client/static/scripts/realtimetraffic.js
index 52b29bf..faf425c 100644
--- a/client/static/scripts/realtimetraffic.js
+++ b/client/static/scripts/realtimetraffic.js
@@ -1,6 +1,6 @@
 /*
+ * Copyright (C) 2018 Simon Eisenmann
  * Copyright (C) 2014-2017 struktur AG
- * http://www.strukturag.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/grabber.go b/grabber.go
index 6fc2090..9ffeed5 100644
--- a/grabber.go
+++ b/grabber.go
@@ -1,6 +1,6 @@
 /*
+ * Copyright (C) 2018 Simon Eisenmann
  * Copyright (C) 2014-2017 struktur AG
- * http://www.strukturag.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/interfacedata.go b/interfacedata.go
index 37e544c..3b4130f 100644
--- a/interfacedata.go
+++ b/interfacedata.go
@@ -1,6 +1,6 @@
 /*
+ * Copyright (C) 2018 Simon Eisenmann
  * Copyright (C) 2014-2017 struktur AG
- * http://www.strukturag.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/realtimetrafficd/conn.go b/realtimetrafficd/conn.go
index 647fb4f..06260eb 100644
--- a/realtimetrafficd/conn.go
+++ b/realtimetrafficd/conn.go
@@ -1,6 +1,6 @@
 /*
+ * Copyright (C) 2018 Simon Eisenmann
  * Copyright (C) 2014-2017 struktur AG
- * http://www.strukturag.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/realtimetrafficd/hub.go b/realtimetrafficd/hub.go
index 5b8b9a7..7d97324 100644
--- a/realtimetrafficd/hub.go
+++ b/realtimetrafficd/hub.go
@@ -1,6 +1,6 @@
 /*
+ * Copyright (C) 2018 Simon Eisenmann
  * Copyright (C) 2014-2017 struktur AG
- * http://www.strukturag.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/realtimetrafficd/main.go b/realtimetrafficd/main.go
index a01602a..ddca3c2 100644
--- a/realtimetrafficd/main.go
+++ b/realtimetrafficd/main.go
@@ -1,6 +1,6 @@
 /*
+ * Copyright (C) 2018 Simon Eisenmann
  * Copyright (C) 2014-2017 struktur AG
- * http://www.strukturag.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/realtimetrafficd/version.go b/realtimetrafficd/version.go
index c6b41dc..69c6a0d 100644
--- a/realtimetrafficd/version.go
+++ b/realtimetrafficd/version.go
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2018 Simon Eisenmann
+ * Copyright (C) 2014-2017 struktur AG
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package main
 
 var Version = "0.0.0"