diff --git a/.gitignore b/.gitignore
index 48a474f..8f435f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,23 @@
 /libreoffice-testing-3.3.2.2.tar.bz2
 /libreoffice-ure-3.3.2.2.tar.bz2
 /libreoffice-writer-3.3.2.2.tar.bz2
+/libreoffice-artwork-3.3.99.1.tar.bz2
+/libreoffice-base-3.3.99.1.tar.bz2
+/libreoffice-bootstrap-3.3.99.1.tar.bz2
+/libreoffice-calc-3.3.99.1.tar.bz2
+/libreoffice-components-3.3.99.1.tar.bz2
+/libreoffice-extensions-3.3.99.1.tar.bz2
+/libreoffice-extras-3.3.99.1.tar.bz2
+/libreoffice-filters-3.3.99.1.tar.bz2
+/libreoffice-help-3.3.99.1.tar.bz2
+/libreoffice-impress-3.3.99.1.tar.bz2
+/libreoffice-libs-core-3.3.99.1.tar.bz2
+/libreoffice-libs-extern-3.3.99.1.tar.bz2
+/libreoffice-libs-extern-sys-3.3.99.1.tar.bz2
+/libreoffice-libs-gui-3.3.99.1.tar.bz2
+/libreoffice-postprocess-3.3.99.1.tar.bz2
+/libreoffice-sdk-3.3.99.1.tar.bz2
+/libreoffice-testing-3.3.99.1.tar.bz2
+/libreoffice-translations-3.3.99.1.tar.bz2
+/libreoffice-ure-3.3.99.1.tar.bz2
+/libreoffice-writer-3.3.99.1.tar.bz2
diff --git a/libreoffice.spec b/libreoffice.spec
index 1847dd0..6e26fe7 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -4,20 +4,6 @@
 %define _default_patch_flags -s -l
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
-# whether to use stlport or gcc's stl, we're basically locked to stlport for
-# i386 to support third party uno components and add-ons designed to work with
-# vanilla OOo.
-%ifarch %{ix86}
-%define stlport_abi_lockin 1
-%else
-%define stlport_abi_lockin 0
-%endif
-
-%if %{stlport_abi_lockin}
-%define stlflags --with-stlport
-%else
-%define stlflags --without-stlport
-%endif
 
 %if %{langpacks}
 %define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu pa-IN he hi hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta th tr ve xh zh-CN zh-TW zu ns tn ts as mr ml or te ur kn uk mai ro si
@@ -28,8 +14,8 @@
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
-Version:        3.3.2.2
-Release:        6%{?dist}
+Version:        3.3.99.1
+Release:        1%{?dist}
 License:        LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -53,7 +39,7 @@ Source15:       http://download.documentfoundation.org/libreoffice/src/libreoffi
 Source16:       http://download.documentfoundation.org/libreoffice/src/libreoffice-testing-%{version}.tar.bz2
 Source17:       http://download.documentfoundation.org/libreoffice/src/libreoffice-ure-%{version}.tar.bz2
 Source18:       http://download.documentfoundation.org/libreoffice/src/libreoffice-writer-%{version}.tar.bz2
-Source19:       http://download.documentfoundation.org/libreoffice/src/libreoffice-l10n-%{version}.tar.bz2
+Source19:       http://download.documentfoundation.org/libreoffice/src/libreoffice-translations-%{version}.tar.bz2
 Source20:       http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
 Source21:       redhat-langpacks.tar.gz
 Source22:       libreoffice-multiliblauncher.sh
@@ -141,10 +127,10 @@ Patch50: 0001-helgrind-Related-rhbz-655686-get-order-of-shutdown-c.patch
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
 %define ureinstdir %{baseinstdir}/ure
-%define basisinstdir %{baseinstdir}/basis3.3
-%define sdkinstdir %{baseinstdir}/basis3.3/sdk
+%define basisinstdir %{baseinstdir}/basis3.4
+%define sdkinstdir %{baseinstdir}/basis3.4/sdk
 %define fontname opensymbol
-%define OFFICEUPD 330
+%define OFFICEUPD 340
 %define SOPOST l*
 
 %description
@@ -828,7 +814,7 @@ autoconf
  --with-system-mythes --with-system-dicts --with-system-apache-commons \
  --with-system-libtextcat --with-system-libtextcat-data --without-system-saxon \
  --with-external-dict-dir=/usr/share/myspell --without-myspell-dicts \
- --without-fonts --without-agg --without-ppds --without-afms %{stlflags} \
+ --without-fonts --without-agg --without-ppds --without-afms \
  --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS" \
  --with-external-tar=`pwd`/ext_sources --with-java-target-version=1.5 \
  --enable-kde4 --without-system-mdds --without-system-hsqldb
@@ -855,9 +841,6 @@ done
 export ARCH_FLAGS
 
 . ./*[Ee]nv.[Ss]et.sh
-%ifarch %{ix86}
-unset HAVE_GCC_VISIBILITY_FEATURE
-%endif
 ./bootstrap
 
 #HANGING JAVA HACK
@@ -2136,6 +2119,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
+* Mon Apr 11 2011 Caolán McNamara <caolanm@redhat.com> 3.3.99.1-1
+- 3.4 beta1
+
 * Tue Apr 05 2011 Caolán McNamara <caolanm@redhat.com> 3.3.2.2-6
 - Resolves: rhbz#655686 get order of shutdown correct
 
diff --git a/sources b/sources
index 40577c5..b1a6e31 100644
--- a/sources
+++ b/sources
@@ -8,23 +8,23 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab  fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3
 cf8a6967f7de535ae257fa411c98eb88  cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2
 17410483b5b5f267aa18b7e00b65e6e0  17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 35c9d670889318e26aad389ed750012f  redhat-langpacks.tar.gz
-cd9f83d8dc2f85f06b2999fd3d23a74d  libreoffice-artwork-3.3.2.2.tar.bz2
-46fb3c85cc878daabb58d94fa848a59d  libreoffice-base-3.3.2.2.tar.bz2
-19698765fe35dcbb1f6d7d55c617c39f  libreoffice-bootstrap-3.3.2.2.tar.bz2
-0274eb33f462e620cb2f37aa696d18b1  libreoffice-calc-3.3.2.2.tar.bz2
-a5f11a035faa6160121dd2d3f984065f  libreoffice-components-3.3.2.2.tar.bz2
-d54e5f7e5cde7f648d74e382eb5e44fc  libreoffice-extensions-3.3.2.2.tar.bz2
-db5d3a8886ec451c11e1ef3cea132ce0  libreoffice-extras-3.3.2.2.tar.bz2
-4ae9b40116ef3f840b232cb3454be4e3  libreoffice-filters-3.3.2.2.tar.bz2
-2dc8e4b347866f9469eb6c42a9cb0b81  libreoffice-help-3.3.2.2.tar.bz2
-e9211340b2a7f48c17883db76d1e8e03  libreoffice-impress-3.3.2.2.tar.bz2
-688768909f823b5006162d27638aa15e  libreoffice-l10n-3.3.2.2.tar.bz2
-26ca2152535ba45bf71d8aa3b26fc967  libreoffice-libs-core-3.3.2.2.tar.bz2
-9df0af97ec8d085864c5341678bb1d0d  libreoffice-libs-extern-3.3.2.2.tar.bz2
-09b22bf1a812affbfe561230940d7da2  libreoffice-libs-extern-sys-3.3.2.2.tar.bz2
-e3dc1c328dfdf4a288946957c69ad32b  libreoffice-libs-gui-3.3.2.2.tar.bz2
-5c0a8203253d053f23613e68cdb69565  libreoffice-postprocess-3.3.2.2.tar.bz2
-2e68a800e323fd3286a0a3305e3d3e39  libreoffice-sdk-3.3.2.2.tar.bz2
-e91523550f9cae015923685ad3fce5ad  libreoffice-testing-3.3.2.2.tar.bz2
-a17434cc2469a263ffabd345e90d8911  libreoffice-ure-3.3.2.2.tar.bz2
-6faf9924a74b836527906f49fcea40c2  libreoffice-writer-3.3.2.2.tar.bz2
+3dec32be5e6d9de3c4c5d549cec6e9e3  libreoffice-artwork-3.3.99.1.tar.bz2
+cb1f4e5005a2fd82a85b1982d172a8c0  libreoffice-base-3.3.99.1.tar.bz2
+1840a6c219b1f68460529204bb396c7a  libreoffice-bootstrap-3.3.99.1.tar.bz2
+7226e5b612313b4e99ccf14cb9ef112b  libreoffice-calc-3.3.99.1.tar.bz2
+4fe16642e5e0c55a1e53d1b44492a905  libreoffice-components-3.3.99.1.tar.bz2
+4eedbc23115d2a6ef491870b02c87953  libreoffice-extensions-3.3.99.1.tar.bz2
+84a392a8e027b354cd7cf5e637599d3e  libreoffice-extras-3.3.99.1.tar.bz2
+e3bf7eb4b7d051ee8c7884ac3526c43f  libreoffice-filters-3.3.99.1.tar.bz2
+0c4267a389d99aaa7b13ba5db3385072  libreoffice-help-3.3.99.1.tar.bz2
+a5ac8c59961c0f46164856b0a6885b30  libreoffice-impress-3.3.99.1.tar.bz2
+2b058457f61505485aca3212cc30f842  libreoffice-libs-core-3.3.99.1.tar.bz2
+c111fa94966e0dfbf8106c95a41e0d52  libreoffice-libs-extern-3.3.99.1.tar.bz2
+100506fcf623bbaa650b38ee1fdd7f12  libreoffice-libs-extern-sys-3.3.99.1.tar.bz2
+c226739110eb805a39b878de6f728ee3  libreoffice-libs-gui-3.3.99.1.tar.bz2
+bc39162ea42554218fe0402363a8be03  libreoffice-postprocess-3.3.99.1.tar.bz2
+1e5d84bc356cca313979f44a7fb323d5  libreoffice-sdk-3.3.99.1.tar.bz2
+e89038bbbb4a4f728eed14e4f95b9abb  libreoffice-testing-3.3.99.1.tar.bz2
+487ffc59476f9e7c5940277096e42c08  libreoffice-translations-3.3.99.1.tar.bz2
+ac5692709b11c061849290e31b80fbd2  libreoffice-ure-3.3.99.1.tar.bz2
+659adf30d4e614d51f482947c1d1121e  libreoffice-writer-3.3.99.1.tar.bz2