diff --git a/COPYING b/COPYING
index de24d95b0827212d252f660e5cbdfbb5fa5c44f2..b9d6c3559f91df4ab3707e9025a3ee43ee7ddb85 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,5 @@
 Copyright (C) 1999,2000 Tom Gilbert.
+Copyright (C) 2010,2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/collage.c b/src/collage.c
index 782d5f8ed7a898beb32e3ba352a5714917b0589c..1f2fac4aeef536d6bcaee869b49ba65e7eb85d11 100644
--- a/src/collage.c
+++ b/src/collage.c
@@ -1,6 +1,7 @@
 /* collage.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/debug.h b/src/debug.h
index 93cb6bff9f0a4101c867c78a80275a26030ffafe..eb929e3e5e084ad516d7b145bd0413cec58f22ab 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -1,6 +1,7 @@
 /* debug.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/events.c b/src/events.c
index 36379b15f32899139367406f1444b99c67268011..f2a1b3e7d5769a19b9cbe7f7d7b5e5e8966966e8 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1,6 +1,7 @@
 /* events.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/feh.h b/src/feh.h
index 5b0243edcb5c0190fac9bfd68e9d720333a9fa61..09a19a616390b51c0f8b8abc6be15d9dee08a1c4 100644
--- a/src/feh.h
+++ b/src/feh.h
@@ -1,6 +1,7 @@
 /* feh.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/filelist.c b/src/filelist.c
index 5c0777d063bf839fa308fd5dd678dd5a31259fa3..b4b481a35feec8eb6eb6ccf3090046f31b1dc527 100644
--- a/src/filelist.c
+++ b/src/filelist.c
@@ -1,6 +1,7 @@
 /* filelist.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/imlib.c b/src/imlib.c
index 89271bf13755e07bb86028b7b6073777e7dd88b1..01384d1d7a7eb8734088d1581c6ebf0fbb6a8418 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -1,6 +1,7 @@
 /* imlib.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/index.c b/src/index.c
index 15dcea18f0454117385ecc7f1747a0e3dc9d3caa..2829bade69c44d0f0ec345b576b51558c5f37904 100644
--- a/src/index.c
+++ b/src/index.c
@@ -1,6 +1,7 @@
 /* index.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/keyevents.c b/src/keyevents.c
index b0bdc8d40a41ca41e5358de3b9c4eabbb60d2c74..0b8b5fdb802245d8f4232f933b2a131074401a13 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -1,6 +1,7 @@
 /* keyevents.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/list.c b/src/list.c
index 989cfcff90848d0b56ca97b269a04b33f5fface0..f52e0d55304379a67b1f48e7575818e6be5cccab 100644
--- a/src/list.c
+++ b/src/list.c
@@ -1,6 +1,7 @@
 /* list.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/main.c b/src/main.c
index 44d2cd8e23232ffdc54bcf5f362d5f00405838bd..6b28e524c6b9a355b007225ccf40cebe6e2a8aa8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,7 @@
 /* main.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/menu.c b/src/menu.c
index c50f0157b08e9d34383d6bd1d41ab933478fbf48..2ef2dc7a58b1b573095b7d0402378d0231d2175e 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,6 +1,7 @@
 /* menu.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/menu.h b/src/menu.h
index 9e8cd2156a3ce2b187ada19effed6e1dbfb811bb..9056d980aeece187035d05db7a289f9865d28adb 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -1,6 +1,7 @@
 /* menu.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/options.c b/src/options.c
index b4c18eac1c8445256468f9381d2fcae373a5e750..bf2f6c0cbc05d58fce13a9876af119624725cb96 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1,6 +1,7 @@
 /* options.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/options.h b/src/options.h
index 337184795ffc3b2245142e6e5e2d3f21a269a791..966169ab7d9ddbb63cf85cf8ed37d952611a16b8 100644
--- a/src/options.h
+++ b/src/options.h
@@ -1,6 +1,7 @@
 /* options.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/slideshow.c b/src/slideshow.c
index de10300e29aa3cf82291f67cb7d2afc148acdcaa..5ceee39fcf367a6ee60362e8bdcf4fcf558676e2 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -1,6 +1,7 @@
 /* slideshow.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/structs.h b/src/structs.h
index a373286ea3de76cc1d6eb4de31a9ef5ab9a56542..3942bc0a4865cd7103f72fe4764d6f6f83b98c47 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,6 +1,7 @@
 /* structs.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/support.c b/src/support.c
index afb941bfaea1c567f53c94ddc95bf21ee27f6a95..d404047c9c1e1abfdaed45e4b5ea9589fc88d1a6 100644
--- a/src/support.c
+++ b/src/support.c
@@ -1,6 +1,7 @@
 /* support.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/support.h b/src/support.h
index bb1708225a2dbaa2cf32d86a2e79ad33e6c7eb40..3cd0fe19a0f91083213efdb9c426661a899c5da5 100644
--- a/src/support.h
+++ b/src/support.h
@@ -1,6 +1,7 @@
 /* support.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/thumbnail.c b/src/thumbnail.c
index ed4e0fb6cfd892a9113ce7c8ac3f97bdbe98774a..9c7c5a6d0be53c8aff89f23d0cabc92e751a2d92 100644
--- a/src/thumbnail.c
+++ b/src/thumbnail.c
@@ -1,6 +1,7 @@
 /* thumbnail.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/thumbnail.h b/src/thumbnail.h
index a384d1184ba223483dd55f7577eace688d28465e..e139c05865e37045161d5af6b0a07533d26edaf2 100644
--- a/src/thumbnail.h
+++ b/src/thumbnail.h
@@ -1,6 +1,7 @@
 /* thumbnail.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/timers.c b/src/timers.c
index cba0716f8add54908f9e2665d762af17bad91230..4cb52518672d8c35bae461cdab4998e58213f4aa 100644
--- a/src/timers.c
+++ b/src/timers.c
@@ -1,6 +1,7 @@
 /* timers.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/winwidget.c b/src/winwidget.c
index 05a4a3a4e58de855216f05ef24fb96b701ae7c70..81f9ab69b7d3d08db904867e3df2b1713e0c8dff 100644
--- a/src/winwidget.c
+++ b/src/winwidget.c
@@ -1,6 +1,7 @@
 /* winwidget.c
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
diff --git a/src/winwidget.h b/src/winwidget.h
index 012d78fe2abeb4739de03f25d26707ec57f99f85..8b4579c9bab486fbed0cac88361f37c506867a45 100644
--- a/src/winwidget.h
+++ b/src/winwidget.h
@@ -1,6 +1,7 @@
 /* winwidget.h
 
 Copyright (C) 1999-2003 Tom Gilbert.
+Copyright (C) 2010-2011 Daniel Friesel.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to