diff --git a/modules/gui/macosx/AppleRemote.h b/modules/gui/macosx/AppleRemote.h
index b1cb764cad06a11b13aec5d534fda9d06738c3b4..4cd015b525792f80a4a8c903b51d596603cfc327 100644
--- a/modules/gui/macosx/AppleRemote.h
+++ b/modules/gui/macosx/AppleRemote.h
@@ -32,7 +32,7 @@
  * or (at your option) any later version.
  * Thus, the following statements apply to our changes:
  *
- * Copyright (C) 2006-2007 the VideoLAN team
+ * Copyright (C) 2006-2007 VLC authors and VideoLAN
  * Authors: Eric Petit <titer@m0k.org>
  *          Felix Kühne <fkuehne at videolan dot org>
  *
diff --git a/modules/gui/macosx/AppleRemote.m b/modules/gui/macosx/AppleRemote.m
index da335c8f2e1c477088e132fa6b6a8b5a59abd5e4..f8bad4e9e709483fa099f21e67142c4ccf46cdfa 100644
--- a/modules/gui/macosx/AppleRemote.m
+++ b/modules/gui/macosx/AppleRemote.m
@@ -32,7 +32,7 @@
  * or (at your option) any later version.
  * Thus, the following statements apply to our changes:
  *
- * Copyright (C) 2006-2009 the VideoLAN team
+ * Copyright (C) 2006-2009 VLC authors and VideoLAN
  * Authors: Eric Petit <titer@m0k.org>
  *          Felix Kühne <fkuehne at videolan dot org>
  *
diff --git a/modules/gui/macosx/AudioEffects.h b/modules/gui/macosx/AudioEffects.h
index 9c477438b0b0e6d6ded8eccda08f4561c1fc5476..71df53cb3673f36f859ae1d702932350913e8709 100644
--- a/modules/gui/macosx/AudioEffects.h
+++ b/modules/gui/macosx/AudioEffects.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * AudioEffects.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2004-2011 the VideoLAN team
+ * Copyright (C) 2004-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
@@ -48,6 +48,22 @@
     IBOutlet id o_eq_band10_sld;
     IBOutlet id o_eq_preamp_sld;
 
+    /* equalizer presets */
+    IBOutlet id o_eqp_panel;
+    IBOutlet id o_eqp_ok_btn;
+    IBOutlet id o_eqp_cancel_btn;
+    IBOutlet id o_eqp_new_lbl;
+    IBOutlet id o_eqp_new_fld;
+    IBOutlet id o_eq_manage_panel;
+    IBOutlet id o_eq_manage_ok_btn;
+    IBOutlet id o_eq_manage_cancel_btn;
+    IBOutlet id o_eq_manage_rename_btn;
+    IBOutlet id o_eq_manage_delete_btn;
+    IBOutlet id o_eq_manage_table;
+    NSMutableArray *o_eq_custom_presets;
+    NSMutableArray *o_eq_custom_presetnames;
+    NSInteger i_to_be_renamed_preset;
+
     /* Compressor */
     IBOutlet id o_comp_enable_ckb;
     IBOutlet id o_comp_reset_btn;
@@ -106,6 +122,7 @@
 
 /* Equalizer */
 - (void)setupEqualizer;
+- (void)rebuildEqMenu;
 - (void)equalizerUpdated;
 - (void)setBandSlidersValues:(float *)values;
 - (void)initBandSliders;
@@ -115,6 +132,10 @@
 - (IBAction)eq_enable:(id)sender;
 - (IBAction)eq_preampSliderUpdated:(id)sender;
 - (IBAction)eq_twopass:(id)sender;
+- (IBAction)eq_nameButtonAction:(id)sender;
+- (IBAction)eq_manageAction:(id)sender;
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView;
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex;
 
 /* Compressor */
 - (void)resetCompressor;
diff --git a/modules/gui/macosx/AudioEffects.m b/modules/gui/macosx/AudioEffects.m
index 15ae6431feadfcd850a081d574aee9eb51185fb0..2f32db2a333fb34af2521c0336a3cf6ad3ca3a9a 100644
--- a/modules/gui/macosx/AudioEffects.m
+++ b/modules/gui/macosx/AudioEffects.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * AudioEffects.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2004-2011 the VideoLAN team
+ * Copyright (C) 2004-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
@@ -54,12 +54,22 @@ static VLCAudioEffects *_o_sharedInstance = nil;
         [self dealloc];
     } else {
         p_intf = VLCIntf;
+        o_eq_custom_presets = [[NSMutableArray alloc] init];
+        o_eq_custom_presetnames = [[NSMutableArray alloc] init];
         _o_sharedInstance = [super init];
     }
     
     return _o_sharedInstance;
 }
 
+- (void)dealloc
+{
+    [o_eq_custom_presets release];
+    [o_eq_custom_presetnames release];
+
+    [super dealloc];
+}
+
 - (void)awakeFromNib
 {
     /* setup the user's language */
@@ -67,12 +77,16 @@ static VLCAudioEffects *_o_sharedInstance = nil;
     [o_eq_enable_ckb setTitle:_NS("Enable")];
     [o_eq_twopass_ckb setTitle:_NS("2 Pass")];
     [o_eq_preamp_lbl setStringValue:_NS("Preamp")];
-    [o_eq_presets_popup removeAllItems];
-    for( int i = 0; i < NB_PRESETS ; i++ )
-    {
-        [o_eq_presets_popup addItemWithTitle: _NS(preset_list_text[i])];
-        [[o_eq_presets_popup lastItem] setTag: i];
-    }
+    [self rebuildEqMenu];
+    [o_eqp_panel setTitle: _NS("New Preset Name")];
+    [o_eqp_ok_btn setTitle: _NS("OK")];
+    [o_eqp_cancel_btn setTitle: _NS("Cancel")];
+    [o_eqp_new_lbl setStringValue: _NS("New Preset Name")];
+    [o_eq_manage_panel setTitle: _NS("Manage Presets")];
+    [o_eq_manage_ok_btn setTitle: _NS("OK")];
+    [o_eq_manage_cancel_btn setTitle: _NS("Cancel")];
+    [o_eq_manage_rename_btn setTitle: _NS("Rename")];
+    [o_eq_manage_delete_btn setTitle: _NS("Delete")];
 
     /* Compressor */
     [o_comp_enable_ckb setTitle:_NS("Enable dynamic range compressor")];
@@ -190,7 +204,7 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
 {
     vlc_object_t *p_object= VLC_OBJECT(getAout());
     if( p_object == NULL )
-        p_object = pl_Get( VLCIntf );
+        p_object = vlc_object_hold(pl_Get( VLCIntf ));
 
     if( p_object )
     {
@@ -234,11 +248,37 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
             }
         }
         free( psz_preset );
+        vlc_object_release( p_object );
     }
 
     [self equalizerUpdated];
 }
 
+- (void)rebuildEqMenu
+{
+    [o_eq_presets_popup removeAllItems];
+    [o_eq_presets_popup addItemWithTitle: _NS("Add Preset")];
+    [[o_eq_presets_popup lastItem] setTag: 300];
+    [o_eq_presets_popup addItemWithTitle: _NS("Manage Presets")];
+    [[o_eq_presets_popup lastItem] setTag: 301];
+    [[o_eq_presets_popup menu] addItem: [NSMenuItem separatorItem]];
+    for (int i = 0; i < NB_PRESETS ; i++)
+    {
+        [o_eq_presets_popup addItemWithTitle: _NS(preset_list_text[i])];
+        [[o_eq_presets_popup lastItem] setTag: i];
+    }
+    if ([o_eq_custom_presetnames count] > 0)
+    {
+        [[o_eq_presets_popup menu] addItem: [NSMenuItem separatorItem]];
+        NSUInteger count = [o_eq_custom_presetnames count];
+        for (unsigned int i = 0; i < count; i++)
+        {
+            [o_eq_presets_popup addItemWithTitle: [o_eq_custom_presetnames objectAtIndex:i]];
+            [[o_eq_presets_popup lastItem] setTag: i + 200];
+        }
+    }
+}
+
 - (void)equalizerUpdated
 {
     float f_preamp, f_band[10];
@@ -360,33 +400,52 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
 }
 - (IBAction)eq_changePreset:(id)sender
 {
-    vlc_object_t *p_object= VLC_OBJECT(getAout());
-    if( p_object == NULL )
-        p_object = vlc_object_hold(pl_Get( p_intf ));
     NSInteger numberOfChosenPreset = [[sender selectedItem] tag];
-    
-    var_SetString( p_object , "equalizer-preset" , preset_list[numberOfChosenPreset] );
-    
-    NSString *preset = @"";
-    const char *psz_values;
-    for( int i = 0; i < EQZ_BANDS_MAX; i++ )
+    if (numberOfChosenPreset == 300)
     {
-        preset = [preset stringByAppendingFormat:@"%.1f ", eqz_preset_10b[numberOfChosenPreset].f_amp[i] ];
+        // add new preset
+        i_to_be_renamed_preset = -1;
+        [NSApp runModalForWindow: o_eqp_panel];
     }
-    psz_values = [preset UTF8String];
-    var_SetString( p_object, "equalizer-bands", psz_values );
-    var_SetFloat( p_object, "equalizer-preamp", eqz_preset_10b[[[sender selectedItem] tag]].f_preamp);
-    
-    [o_eq_preamp_sld setFloatValue: eqz_preset_10b[numberOfChosenPreset].f_preamp];
-    
-    [self setBandSlidersValues:(float *)eqz_preset_10b[numberOfChosenPreset].f_amp];
-    
-    /* save changed to config */
-    config_PutPsz( p_intf, "equalizer-bands", psz_values );
-    config_PutFloat( p_intf, "equalizer-preamp", eqz_preset_10b[numberOfChosenPreset].f_preamp );
-    config_PutPsz( p_intf, "equalizer-preset", preset_list[numberOfChosenPreset] );
+    else if(numberOfChosenPreset == 301)
+    {
+        // manage presets
+        [o_eq_manage_table reloadData];
+        [NSApp runModalForWindow: o_eq_manage_panel];
+    }
+    else if(numberOfChosenPreset >= 200)
+    {
+        // custom preset, TODO
+    }
+    else
+    {
+        vlc_object_t *p_object= VLC_OBJECT(getAout());
+        if( p_object == NULL )
+            p_object = vlc_object_hold(pl_Get( p_intf ));
 
-    vlc_object_release( p_object );
+        var_SetString( p_object , "equalizer-preset" , preset_list[numberOfChosenPreset] );
+
+        NSString *preset = @"";
+        const char *psz_values;
+        for( int i = 0; i < EQZ_BANDS_MAX; i++ )
+        {
+            preset = [preset stringByAppendingFormat:@"%.1f ", eqz_preset_10b[numberOfChosenPreset].f_amp[i] ];
+        }
+        psz_values = [preset UTF8String];
+        var_SetString( p_object, "equalizer-bands", psz_values );
+        var_SetFloat( p_object, "equalizer-preamp", eqz_preset_10b[numberOfChosenPreset].f_preamp);
+
+        [o_eq_preamp_sld setFloatValue: eqz_preset_10b[numberOfChosenPreset].f_preamp];
+
+        [self setBandSlidersValues:(float *)eqz_preset_10b[numberOfChosenPreset].f_amp];
+
+        /* save changed to config */
+        config_PutPsz( p_intf, "equalizer-bands", psz_values );
+        config_PutFloat( p_intf, "equalizer-preamp", eqz_preset_10b[numberOfChosenPreset].f_preamp );
+        config_PutPsz( p_intf, "equalizer-preset", preset_list[numberOfChosenPreset] );
+
+        vlc_object_release( p_object );
+    }
 }
 - (IBAction)eq_preampSliderUpdated:(id)sender
 {
@@ -419,6 +478,64 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
     vlc_object_release( p_object );
 }
 
+- (IBAction)eq_nameButtonAction:(id)sender
+{
+    [NSApp stopModal];
+    [[sender window] orderOut:sender];
+
+    if (sender == o_eqp_ok_btn)
+    {
+        if (i_to_be_renamed_preset != -1)
+        {
+            // rename existing preset
+            [o_eq_custom_presetnames replaceObjectAtIndex:i_to_be_renamed_preset withObject:[o_eqp_new_fld stringValue]];
+            [o_eq_manage_table reloadData];
+            [self rebuildEqMenu];
+        }
+        else
+        {
+            // add new preset
+            [o_eq_custom_presetnames addObject: [o_eqp_new_fld stringValue]];
+            [self rebuildEqMenu];
+
+            // TODO
+        }
+    }
+}
+
+- (IBAction)eq_manageAction:(id)sender
+{
+    if (sender == o_eq_manage_cancel_btn || sender == o_eq_manage_ok_btn) {
+        [NSApp stopModal];
+        [[sender window] orderOut:sender];
+    }
+    else if( sender == o_eq_manage_delete_btn )
+    {
+        [o_eq_custom_presets removeObjectAtIndex: [o_eq_manage_table selectedRow]];
+        [o_eq_custom_presetnames removeObjectAtIndex: [o_eq_manage_table selectedRow]];
+        [o_eq_manage_table reloadData];
+        [self rebuildEqMenu];
+    }
+    else
+    {
+        i_to_be_renamed_preset = [o_eq_manage_table selectedRow];
+        [o_eqp_new_fld setStringValue: [o_eq_custom_presetnames objectAtIndex: i_to_be_renamed_preset]];
+        [NSApp stopModal];
+        [[sender window] orderOut:sender];
+        [NSApp runModalForWindow: o_eqp_panel];
+    }
+}
+
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
+{
+    return [o_eq_custom_presets count];
+}
+
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+{
+    return [o_eq_custom_presetnames objectAtIndex:rowIndex];
+}
+
 #pragma mark -
 #pragma mark Compressor
 - (void)resetCompressor
diff --git a/modules/gui/macosx/CompatibilityFixes.h b/modules/gui/macosx/CompatibilityFixes.h
index 8fd8b6afa0c20c3243e9f3f8778090ac29e6a943..d43d1852b388fef9a13560a47b6c238290f8ac73 100644
--- a/modules/gui/macosx/CompatibilityFixes.h
+++ b/modules/gui/macosx/CompatibilityFixes.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * sdkfixes.h: MacOS X interface module
+ * CompatibilityFixes.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2011 VideoLAN
+ * Copyright (C) 2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h
index a1668e332f68685a9dcdaeaaf88f9a3c26b2c3ac..3b2552ae85a4d41fc79facbaa195c55dcc6e3bd0 100644
--- a/modules/gui/macosx/MainWindow.h
+++ b/modules/gui/macosx/MainWindow.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * MainWindow.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2011 VideoLAN
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index b96c8a2a981bae9cf22ff87fd5176d817a9a8509..c78e19ea445aaa3153dcd12cf3a0d57ef22ea929 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * MainWindow.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2011 VideoLAN
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
diff --git a/modules/gui/macosx/TrackSynchronization.h b/modules/gui/macosx/TrackSynchronization.h
index 119ee979464fdca6193861f587bc9fee1c84081a..68e3efcf45022d9b63373c58cac7f2bbcd1d9ed6 100644
--- a/modules/gui/macosx/TrackSynchronization.h
+++ b/modules/gui/macosx/TrackSynchronization.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * TrackSynchronization.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2011 VideoLAN
+ * Copyright (C) 2011 VLC authors and VideoLAN
  * Copyright (C) 2011 Felix Paul Kühne
  * $Id$
  *
diff --git a/modules/gui/macosx/TrackSynchronization.m b/modules/gui/macosx/TrackSynchronization.m
index b465b260c39df9fedc27f86a2a0e2627201cb87a..0566d9ad10a5bcd54b1ef935bc2203f0313f2a93 100644
--- a/modules/gui/macosx/TrackSynchronization.m
+++ b/modules/gui/macosx/TrackSynchronization.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * TrackSynchronization.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2011 VideoLAN
+ * Copyright (C) 2011 VLC authors and VideoLAN
  * Copyright (C) 2011 Felix Paul Kühne
  * $Id$
  *
diff --git a/modules/gui/macosx/VideoView.h b/modules/gui/macosx/VideoView.h
index e5b22b2398602cd4df972a10a03a42e034716391..635da1643537857407c83aedaf0b6cb7ca83c6dc 100644
--- a/modules/gui/macosx/VideoView.h
+++ b/modules/gui/macosx/VideoView.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * VideoView.h: MacOS X video output module
  *****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman <hartman at videolan dot org>
diff --git a/modules/gui/macosx/VideoView.m b/modules/gui/macosx/VideoView.m
index 86e9b05433f83fbdb056416d2bdf562f4c0069e7..1a90d108e945dd079abc8741131e83d2533e1727 100644
--- a/modules/gui/macosx/VideoView.m
+++ b/modules/gui/macosx/VideoView.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * VideoView.m: MacOS X video output module
  *****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman <hartman at videolan dot org>
diff --git a/modules/gui/macosx/about.h b/modules/gui/macosx/about.h
index b04355f7eda1742f9053111e6708c9a12e0bfc63..9580c6e77de7f836c9345588ce87d60933af0275 100644
--- a/modules/gui/macosx/about.h
+++ b/modules/gui/macosx/about.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * about.h: MacOS X About Panel
  *****************************************************************************
- * Copyright (C) 2001-2007 the VideoLAN team
+ * Copyright (C) 2001-2007 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
diff --git a/modules/gui/macosx/about.m b/modules/gui/macosx/about.m
index e184c3be8dc778ba08a1f4ce2f9f2f184f6582ee..e02ae55c97119f71ab1c7d7db43093ded61542fe 100644
--- a/modules/gui/macosx/about.m
+++ b/modules/gui/macosx/about.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * about.m: MacOS X About Panel
  *****************************************************************************
- * Copyright (C) 2001-2011 the VideoLAN team
+ * Copyright (C) 2001-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
diff --git a/modules/gui/macosx/applescript.h b/modules/gui/macosx/applescript.h
index b4be026c8bae1022f8f0e7162a44f59a860951dc..990d44990e6ee3ded040782410a2586684fb7543 100644
--- a/modules/gui/macosx/applescript.h
+++ b/modules/gui/macosx/applescript.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * applescript.h: MacOS X AppleScript support
  *****************************************************************************
- * Copyright (C) 2002-2003, 2005, 2007 the VideoLAN team
+ * Copyright (C) 2002-2003, 2005, 2007 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
diff --git a/modules/gui/macosx/applescript.m b/modules/gui/macosx/applescript.m
index 9e01c7e69ae3907b497c637d0e7ca363765a01f6..6bfab414c7cf0d5074f62e189de681fc416c64fe 100644
--- a/modules/gui/macosx/applescript.m
+++ b/modules/gui/macosx/applescript.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * applescript.m: MacOS X AppleScript support
  *****************************************************************************
- * Copyright (C) 2002-2009 the VideoLAN team
+ * Copyright (C) 2002-2009 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
diff --git a/modules/gui/macosx/bookmarks.h b/modules/gui/macosx/bookmarks.h
index 2b255fc2db3732987f578d5befcd047743286880..4e83c5fc77e566b9d1af5e9cb9b2c029364b6a6c 100644
--- a/modules/gui/macosx/bookmarks.h
+++ b/modules/gui/macosx/bookmarks.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * bookmarks.h: MacOS X Bookmarks window
  *****************************************************************************
- * Copyright (C) 2005, 2007 the VideoLAN team
+ * Copyright (C) 2005, 2007 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Felix Kühne <fkuehne at videolan dot org>
diff --git a/modules/gui/macosx/bookmarks.m b/modules/gui/macosx/bookmarks.m
index aaee87f1e78d514c81826f9d6c8899bc881a224d..48037331ce8351851303352c2531a40d734a413c 100644
--- a/modules/gui/macosx/bookmarks.m
+++ b/modules/gui/macosx/bookmarks.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * bookmarks.m: MacOS X Bookmarks window
  *****************************************************************************
- * Copyright (C) 2005 - 2007 the VideoLAN team
+ * Copyright (C) 2005 - 2007 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Felix Kühne <fkuehne at videolan dot org>
diff --git a/modules/gui/macosx/controls.h b/modules/gui/macosx/controls.h
index 0d9aa367bf5b34dfcfc82733d29711d3645cd581..8797a0c43ccfd1febac9a70d9120bab9868ac53d 100644
--- a/modules/gui/macosx/controls.h
+++ b/modules/gui/macosx/controls.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * controls.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index 0ad95d84037ff4e741cf9d5644d1996326488aa6..51a61b7bae5802e94d059d000d601f380e544642 100644
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * controls.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
diff --git a/modules/gui/macosx/coredialogs.h b/modules/gui/macosx/coredialogs.h
index ea3829c0b9d602949af2d2bd63f866cc25c6214d..79d94f7a16e3908e31e4a69e98bf978fb8a6bd68 100644
--- a/modules/gui/macosx/coredialogs.h
+++ b/modules/gui/macosx/coredialogs.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * coredialogs.h: Mac OS X Core Dialogs
  *****************************************************************************
- * Copyright (C) 2005-2009 the VideoLAN team
+ * Copyright (C) 2005-2009 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman <hartman at videolan dot org>
diff --git a/modules/gui/macosx/coredialogs.m b/modules/gui/macosx/coredialogs.m
index 7af5e69ab4c864c5bfeaff0d779e222c80f074ba..6a7897860d1d6a6d3bf167d461d0ee22de62e126 100644
--- a/modules/gui/macosx/coredialogs.m
+++ b/modules/gui/macosx/coredialogs.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * coredialogs.m: Mac OS X Core Dialogs
  *****************************************************************************
- * Copyright (C) 2005-2009 the VideoLAN team
+ * Copyright (C) 2005-2009 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman <hartman at videolan dot org>
diff --git a/modules/gui/macosx/eyetv.h b/modules/gui/macosx/eyetv.h
index c93dcfcc5bb71d5932b54264960ac4fa0e011bef..dc47ddc9b45b5ba40881de6da084c63398b483b3 100644
--- a/modules/gui/macosx/eyetv.h
+++ b/modules/gui/macosx/eyetv.h
@@ -1,41 +1,41 @@
-/*****************************************************************************
-* eyetv.h: small class to control the notification parts of the EyeTV plugin
-*****************************************************************************
-* Copyright (C) 2006-2007 the VideoLAN team
-* $Id$
-*
-* Authors: Felix Kühne <fkuehne at videolan dot org>
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
-*****************************************************************************/
-
-#import <Cocoa/Cocoa.h>
-
-
-@interface VLCEyeTVController : NSObject
-{
-    BOOL b_eyeTVactive;
-    BOOL b_deviceConnected;
-}
-- (void)globalNotificationReceived: (NSNotification *)theNotification;
-- (BOOL)isEyeTVrunning;
-- (BOOL)isDeviceConnected;
-- (void)launchEyeTV;
-- (int)currentChannel;
-- (int)switchChannelUp:(BOOL)b_yesOrNo;
-- (void)selectChannel:(int)theChannelNum;
-- (NSEnumerator *)allChannels;
-
-@end
+/*****************************************************************************
+* eyetv.h: small class to control the notification parts of the EyeTV plugin
+*****************************************************************************
+* Copyright (C) 2006-2007 VLC authors and VideoLAN
+* $Id$
+*
+* Authors: Felix Kühne <fkuehne at videolan dot org>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+*****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface VLCEyeTVController : NSObject
+{
+    BOOL b_eyeTVactive;
+    BOOL b_deviceConnected;
+}
+- (void)globalNotificationReceived: (NSNotification *)theNotification;
+- (BOOL)isEyeTVrunning;
+- (BOOL)isDeviceConnected;
+- (void)launchEyeTV;
+- (int)currentChannel;
+- (int)switchChannelUp:(BOOL)b_yesOrNo;
+- (void)selectChannel:(int)theChannelNum;
+- (NSEnumerator *)allChannels;
+
+@end
diff --git a/modules/gui/macosx/eyetv.m b/modules/gui/macosx/eyetv.m
index b6f59139f5e35966364c30cef47f0f4a873cacc7..732d368bd3cd5d0b099232692ee2932e9fe77fbe 100644
--- a/modules/gui/macosx/eyetv.m
+++ b/modules/gui/macosx/eyetv.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
 * eyetv.m: small class to control the notification parts of the EyeTV plugin
 *****************************************************************************
-* Copyright (C) 2006-2011 the VideoLAN team
+* Copyright (C) 2006-2011 VLC authors and VideoLAN
 * $Id$
 *
 * Authors: Felix Kühne <fkuehne at videolan dot org>
diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 97a2437066fd71a7e6d7a17efc897aa159999ba8..6c3b7208632fdde61a49761edff70fe8653d70bb 100644
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * intf.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index c69633d18e0427be1bd392faff96a7545a6ed1b5..387a1f35f3c812cc638c5f024a8c78ebf6307b62 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * intf.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index 1befa97664489f3cf213c00a91b60701e8ecc64e..c32c929c3d128a4b10d78a7311ffa53acb0960ee 100644
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * macosx.m: Mac OS X module for vlc
  *****************************************************************************
- * Copyright (C) 2001-2011 the VideoLAN team
+ * Copyright (C) 2001-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Colin Delacroix <colin@zoy.org>
diff --git a/modules/gui/macosx/misc.h b/modules/gui/macosx/misc.h
index 3d8cbf5c790e117239b56716ffb0b4cbdd4fda17..a29b4dcf6a5b728a89858b28ce40597bc69faeec 100644
--- a/modules/gui/macosx/misc.h
+++ b/modules/gui/macosx/misc.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * misc.h: code not specific to vlc
  *****************************************************************************
- * Copyright (C) 2003-2011 the VideoLAN team
+ * Copyright (C) 2003-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m
index df621ed682dce18202d493e6ef3a7b694eb8311d..60e044bdf27173fd94ef84ce88b9566ef2fec80a 100644
--- a/modules/gui/macosx/misc.m
+++ b/modules/gui/macosx/misc.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * misc.m: code not specific to vlc
  *****************************************************************************
- * Copyright (C) 2003-2011 the VideoLAN team
+ * Copyright (C) 2003-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h
index d766e6010baa805f87c49bd3b14c12c31d8bd8d6..011787645b0accba57d8065a9f09370395d8987f 100644
--- a/modules/gui/macosx/open.h
+++ b/modules/gui/macosx/open.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * open.h: Open dialogues for VLC's MacOS X port
  *****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index 01f66a6d6d367dcf6ada44c3736e6c6c49c04c46..9b0732828e7e67c76ecadb341c7afb83d90d88a1 100644
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * open.m: Open dialogues for VLC's MacOS X port
  *****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
diff --git a/modules/gui/macosx/output.h b/modules/gui/macosx/output.h
index 56aca1539cab01f83cfbf891606f315266b3980b..0c0eaba8bc6aa394cba93aff70e41871de86eaaa 100644
--- a/modules/gui/macosx/output.h
+++ b/modules/gui/macosx/output.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * output.h: MacOS X Output Dialog
  *****************************************************************************
- * Copyright (C) 2002-2007 the VideoLAN team
+ * Copyright (C) 2002-2007 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
diff --git a/modules/gui/macosx/output.m b/modules/gui/macosx/output.m
index 77d05804ce9b3cc3b79d3ece4b39501ff3051a75..5271cf34ec7341f21dd95b65ece33b0f80b93309 100644
--- a/modules/gui/macosx/output.m
+++ b/modules/gui/macosx/output.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * output.m: MacOS X Output Dialog
  *****************************************************************************
- * Copyright (C) 2002-2007 the VideoLAN team
+ * Copyright (C) 2002-2007 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index d70db58c1beeda83df6a86c32be92559e0979174..6f30ba1be7e912adfb18032c76a8c1ab5723043f 100644
--- a/modules/gui/macosx/playlist.h
+++ b/modules/gui/macosx/playlist.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * playlist.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2006 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index bda26646674758ed128512b3b8dd7d41ceb31b5b..7d9acfe17f878811528132b3159cc2764fced869 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * playlist.m: MacOS X interface module
  *****************************************************************************
-* Copyright (C) 2002-2009 the VideoLAN team
+* Copyright (C) 2002-2009 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
diff --git a/modules/gui/macosx/playlistinfo.h b/modules/gui/macosx/playlistinfo.h
index 01d53470ed3451e9876aa2ea269c481d793a66f9..3ae96643bf7be4a04e059e54c9ed23a8f4d3d7cf 100644
--- a/modules/gui/macosx/playlistinfo.h
+++ b/modules/gui/macosx/playlistinfo.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * playlistinfo.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2008 the VideoLAN team
+ * Copyright (C) 2002-2008 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Benjamin Pracht <bigben at videolan dot org>
diff --git a/modules/gui/macosx/playlistinfo.m b/modules/gui/macosx/playlistinfo.m
index 602f1d3126981acb263215edd8f4c49ed483498c..5feba0f06d89124399d167696208592d86bb6cf2 100644
--- a/modules/gui/macosx/playlistinfo.m
+++ b/modules/gui/macosx/playlistinfo.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  r playlistinfo.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2009 the VideoLAN team
+ * Copyright (C) 2002-2009 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Benjamin Pracht <bigben at videolan dot org>
diff --git a/modules/gui/macosx/prefs.h b/modules/gui/macosx/prefs.h
index 66eb93d512f0be1b19c06ac922df4d5af1704a13..2d77d48c02a6d614b8944fdf7311db159e7e3666 100644
--- a/modules/gui/macosx/prefs.h
+++ b/modules/gui/macosx/prefs.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * prefs.h: MacOS X module for vlc
  *****************************************************************************
- * Copyright (C) 2002-2007 the VideoLAN team
+ * Copyright (C) 2002-2007 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index 8237e06d7cb261e7aa6b6f5b62fbca0ae501d73d..a856d164b6ac873c994e7740256c4bc799c1af32 100644
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * prefs.m: MacOS X module for vlc
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2006 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
diff --git a/modules/gui/macosx/prefs_widgets.h b/modules/gui/macosx/prefs_widgets.h
index bc0e3ebaac9129deb70e8cc334fb3f51b495cdda..c0b35a2dbffc57c83329d9e4aee1a446fa095b88 100644
--- a/modules/gui/macosx/prefs_widgets.h
+++ b/modules/gui/macosx/prefs_widgets.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * prefs_widgets.h: Preferences controls
  *****************************************************************************
- * Copyright (C) 2002-2007 the VideoLAN team
+ * Copyright (C) 2002-2007 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman <hartman at videolan.org>
diff --git a/modules/gui/macosx/prefs_widgets.m b/modules/gui/macosx/prefs_widgets.m
index 232d9813fa3c22459072b86adf3aee78cbf684b4..b1c2001636e78cbed5e4ac33095e3a03f20c5c44 100644
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * prefs_widgets.m: Preferences controls
  *****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman <hartman at videolan.org>
diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h
index 0bf93f2621a08c06a257022b3163ef6b2e4d5496..002ff49ee96b9cffac810a055106778a0c2a74ee 100644
--- a/modules/gui/macosx/simple_prefs.h
+++ b/modules/gui/macosx/simple_prefs.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
 * simple_prefs.h: Simple Preferences for Mac OS X
 *****************************************************************************
-* Copyright (C) 2008-2011 the VideoLAN team
+* Copyright (C) 2008-2011 VLC authors and VideoLAN
 * $Id$
 *
 * Authors: Felix Paul Kühne <fkuehne at videolan dot org>
diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 90be645b54a76181a07fb39a8f968996b49cd470..43728ccd68c677f38e5043a5c19261751b910114 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
 * simple_prefs.m: Simple Preferences for Mac OS X
 *****************************************************************************
-* Copyright (C) 2008-2011 the VideoLAN team
+* Copyright (C) 2008-2011 VLC authors and VideoLAN
 * $Id$
 *
 * Authors: Felix Paul Kühne <fkuehne at videolan dot org>
diff --git a/modules/gui/macosx/wizard.h b/modules/gui/macosx/wizard.h
index 534875188de14ebcbdf6499746cbe6e9923a6319..2bd7bb1041501d6e3697a458a96ad973e0c98d9e 100644
--- a/modules/gui/macosx/wizard.h
+++ b/modules/gui/macosx/wizard.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * wizard.h: MacOS X Streaming Wizard
  *****************************************************************************
- * Copyright (C) 2005-2007 the VideoLAN team
+ * Copyright (C) 2005-2007 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Felix Kühne <fkuehne at videolan dot org>
diff --git a/modules/gui/macosx/wizard.m b/modules/gui/macosx/wizard.m
index cba436d3276beda8c78fcb44bd3ab9e64962b0b1..721fe9da312285a42d848a06c17a2821799e6f52 100644
--- a/modules/gui/macosx/wizard.m
+++ b/modules/gui/macosx/wizard.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * wizard.m: MacOS X Streaming Wizard
  *****************************************************************************
- * Copyright (C) 2005-2009 the VideoLAN team
+ * Copyright (C) 2005-2009 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Felix Kühne <fkuehne at videolan dot org>