diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30e31eb031..691610831a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,6 +75,7 @@ set(kwin_KDEINIT_SRCS
    effects/minimizeanimation.cpp
    effects/desktopchangeslide.cpp
    effects/boxswitch.cpp
+   effects/fallapart.cpp
    effects/test_input.cpp
    effects/test_thumbnail.cpp
    )
diff --git a/effects.cpp b/effects.cpp
index ce3a940b1e..1e1b1909e9 100644
--- a/effects.cpp
+++ b/effects.cpp
@@ -31,6 +31,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "effects/videorecord.h"
 #endif
 #ifdef HAVE_OPENGL
+#include "effects/fallapart.h"
 #include "effects/wavywindows.h"
 #endif
 #include "effects/zoom.h"
@@ -189,6 +190,7 @@ EffectsHandler::EffectsHandler()
     registerEffect("ShiftWorkspaceUp", new GenericEffectFactory<ShiftWorkspaceUpEffect>);
     registerEffect("Fade", new GenericEffectFactory<FadeEffect>);
     registerEffect("ScaleIn", new GenericEffectFactory<ScaleInEffect>);
+    registerEffect("FallApart", new GenericEffectFactory<FallApartEffect>);
     registerEffect("DialogParent", new GenericEffectFactory<DialogParentEffect>);
     registerEffect("DesktopChangeSlide", new GenericEffectFactory<DesktopChangeSlideEffect>);
     registerEffect("BoxSwitch", new GenericEffectFactory<BoxSwitchEffect>);
diff --git a/effects/fallapart.cpp b/effects/fallapart.cpp
new file mode 100644
index 0000000000..3d132b3b04
--- /dev/null
+++ b/effects/fallapart.cpp
@@ -0,0 +1,107 @@
+/*****************************************************************
+ KWin - the KDE window manager
+ This file is part of the KDE project.
+
+Copyright (C) 2007 Lubos Lunak <l.lunak@kde.org>
+
+You can Freely distribute this program under the GNU General Public
+License. See the file "COPYING" for the exact licensing terms.
+******************************************************************/
+
+#include "fallapart.h"
+
+#include <deleted.h>
+#include <scene_opengl.h>
+
+namespace KWinInternal
+{
+
+void FallApartEffect::prePaintScreen( int* mask, QRegion* region, int time )
+    {
+    if( !windows.isEmpty())
+        *mask |= Scene::PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS;
+    effects->prePaintScreen(mask, region, time);
+    }
+
+void FallApartEffect::prePaintWindow( EffectWindow* w, int* mask, QRegion* region, int time )
+    {
+    if( windows.contains( w ))
+        {
+        SceneOpenGL::Window* glwin = dynamic_cast< SceneOpenGL::Window* >( w->sceneWindow());
+        if( glwin )
+            {
+            if( windows[ w ] < 1 )
+                {
+                windows[ w ] += time / 500.;
+                *mask |= Scene::PAINT_WINDOW_TRANSFORMED;
+                glwin->enablePainting( Scene::Window::PAINT_DISABLED_BY_DELETE );
+                // Request the window to be divided into cells
+                glwin->requestVertexGrid( 10 );
+                }
+            else
+                {
+                windows.remove( w );
+                static_cast< Deleted* >( w->window())->unrefWindow();
+                }
+            }
+        }
+    effects->prePaintWindow( w, mask, region, time );
+    }
+
+void FallApartEffect::paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data )
+    {
+    if( windows.contains( w ))
+        {
+        SceneOpenGL::Window* glwin = dynamic_cast< SceneOpenGL::Window* >( w->sceneWindow() );
+        if( glwin )
+            {
+            QVector< SceneOpenGL::Window::Vertex >& vertices = glwin->vertices();
+            assert( vertices.count() % 4 == 0 );
+            for( int i = 0;
+                 i < vertices.count();
+                 i += 4 )
+                {
+                double xdiff = 0;
+                if( vertices[ i ].pos[ 0 ] < w->width() / 2 )
+                    xdiff = -( w->width() / 2 - vertices[ i ].pos[ 0 ] ) / w->width() * 100;
+                if( vertices[ i ].pos[ 0 ] > w->width() / 2 )
+                    xdiff = ( vertices[ i ].pos[ 0 ] - w->width() / 2 ) / w->width() * 100;
+                double ydiff = 0;
+                if( vertices[ i ].pos[ 1 ] < w->height() / 2 )
+                    ydiff = -( w->height() / 2 - vertices[ i ].pos[ 1 ] ) / w->height() * 100;
+                if( vertices[ i ].pos[ 1 ] > w->height() / 2 )
+                    ydiff = ( vertices[ i ].pos[ 1 ] - w->height() / 2 ) / w->height() * 100;
+                double modif = windows[ w ] * windows[ w ] * 16;
+                for( int j = 0;
+                     j < 4;
+                     ++j )
+                    {
+                    vertices[ i + j ].pos[ 0 ] += xdiff * modif;
+                    vertices[ i + j ].pos[ 1 ] += ydiff * modif;
+                    }
+                }
+            glwin->markVerticesDirty();
+            }
+        }
+    effects->paintWindow( w, mask, region, data );
+    }
+
+void FallApartEffect::postPaintScreen()
+    {
+    if( !windows.isEmpty())
+        workspace()->addRepaintFull();
+    effects->postPaintScreen();
+    }
+
+void FallApartEffect::windowClosed( EffectWindow* c )
+    {
+    windows[ c ] = 0;
+    static_cast< Deleted* >( c->window())->refWindow();
+    }
+
+void FallApartEffect::windowDeleted( EffectWindow* c )
+    {
+    windows.remove( c );
+    }
+
+} // namespace
diff --git a/effects/fallapart.h b/effects/fallapart.h
new file mode 100644
index 0000000000..45115bcef7
--- /dev/null
+++ b/effects/fallapart.h
@@ -0,0 +1,35 @@
+/*****************************************************************
+ KWin - the KDE window manager
+ This file is part of the KDE project.
+
+Copyright (C) 2007 Lubos Lunak <l.lunak@kde.org>
+
+You can Freely distribute this program under the GNU General Public
+License. See the file "COPYING" for the exact licensing terms.
+******************************************************************/
+
+#ifndef KWIN_FALLAPART_H
+#define KWIN_FALLAPART_H
+
+#include <effects.h>
+
+namespace KWinInternal
+{
+
+class FallApartEffect
+    : public Effect
+    {
+    public:
+        virtual void prePaintScreen( int* mask, QRegion* region, int time );
+        virtual void prePaintWindow( EffectWindow* w, int* mask, QRegion* region, int time );
+        virtual void paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data );
+        virtual void postPaintScreen();
+        virtual void windowClosed( EffectWindow* c );
+        virtual void windowDeleted( EffectWindow* c );
+    private:
+        QMap< const EffectWindow*, double > windows;
+    };
+
+} // namespace
+
+#endif