diff -uNr src.ORIG/Makefile src/Makefile
--- src.ORIG/Makefile	2012-11-08 10:46:21.000000000 +0900
+++ src/Makefile	2012-11-08 11:21:39.000000000 +0900
@@ -24,12 +24,18 @@
 # remove the "pdfdum.o" as we don't want that going into the .a library
 FOBJS = $(filter-out pdfdum.o,$(FOBJSALL))
 
+#--
+# 2012/11/08 K.Fujii
+#--
+OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
+OBJSALL = $(OBJS)
+
 #------------------------------------------
 
 all: $(LIB)/liblund.a $(LIB)/pydata.o 
 
-$(LIB)/liblund.a: $(FOBJS) 
-	$(AR) -urs $(LIB)/liblund.a $(FOBJS) 
+$(LIB)/liblund.a: $(FOBJS) $(OBJS)
+	$(AR) -urs $(LIB)/liblund.a $(FOBJS) $(OBJS)
 
 $(LIB)/pydata.o: pydata.o
 	cp -p pydata.o $(LIB)/pydata.o
diff -uNr src.ORIG/idate.c src/idate.c
--- src.ORIG/idate.c	2012-11-08 11:14:46.000000000 +0900
+++ src/idate.c	2012-11-08 11:14:46.000000000 +0900
@@ -0,0 +1,25 @@
+#include <time.h>
+
+void idate_(int idtemp[])
+{
+  struct tm q;
+  time_t    tp;
+
+  time(&tp);
+  q = *localtime(&tp);
+  idtemp[0] = q.tm_year + 1900;
+  idtemp[1] = q.tm_mon + 1;
+  idtemp[2] = q.tm_mday;
+}
+
+void itime_(int idtemp[])
+{
+  struct tm q;
+  time_t    tp;
+
+  time(&tp);
+  q = *localtime(&tp);
+  idtemp[0] = q.tm_hour;
+  idtemp[1] = q.tm_min;
+  idtemp[2] = q.tm_sec;
+}
diff -uNr src.ORIG/pydatawrapper.F src/pydatawrapper.F
--- src.ORIG/pydatawrapper.F	2012-11-08 11:14:46.000000000 +0900
+++ src/pydatawrapper.F	2012-11-08 11:14:46.000000000 +0900
@@ -0,0 +1,8 @@
+      subroutine pydatawrapper
+      external pydata
+      call pydatadummysub(pydata)
+      return
+      end
+      subroutine pydatadummysub(a)
+      return
+      end
diff -uNr src.ORIG/pydecy.f src/pydecy.f
--- src.ORIG/pydecy.f	2012-11-08 10:46:22.000000000 +0900
+++ src/pydecy.f	2012-11-07 21:00:34.000000000 +0900
@@ -134,10 +134,10 @@
         IF(KFORIG.NE.0.OR.MSTJ(28).EQ.2) THEN
           CALL PYTAUD(ITAU,IORIG,KFORIG,NDECAY)
           DO 200 II=NSAV+1,NSAV+NDECAY
-            K(II,1)=1
-            K(II,3)=IP
-            K(II,4)=0
-            K(II,5)=0
+C            K(II,1)=1
+C            K(II,3)=IP
+C            K(II,4)=0
+C            K(II,5)=0
   200     CONTINUE
           N=NSAV+NDECAY
         ENDIF
@@ -814,7 +814,14 @@
       IF(K(IP,1).LE.10) K(IP,1)=11
       IF(MMIX.EQ.1.AND.MSTJ(26).EQ.2.AND.K(IP,1).EQ.11) K(IP,1)=12
       K(IP,4)=NSAV+1
+      if (mstj(28) .ge. 1 ) then
+         do iii=nsav+1,n
+            if ( k(iii,3) .eq. ip ) then
+               k(ip,5)=iii
+            endif
+         enddo
+      else
       K(IP,5)=N
- 
+      endif
       RETURN
       END
diff -uNr src.ORIG/upinit.f src/upinit.f
--- src.ORIG/upinit.f	2012-11-08 10:46:22.000000000 +0900
+++ src/upinit.f	2012-11-08 11:07:22.000000000 +0900
@@ -1,66 +1,8 @@
- 
 C*********************************************************************
- 
 C...UPINIT
 C...Dummy routine, to be replaced by a user implementing external
 C...processes. Is supposed to fill the HEPRUP commonblock with info
 C...on incoming beams and allowed processes.
 
-C...New example: handles a standard Les Houches Events File.
-
       SUBROUTINE UPINIT
- 
-C...Double precision and integer declarations.
-      IMPLICIT DOUBLE PRECISION(A-H, O-Z)
-      IMPLICIT INTEGER(I-N)
- 
-C...PYTHIA commonblock: only used to provide read unit MSTP(161).
-      COMMON/PYPARS/MSTP(200),PARP(200),MSTI(200),PARI(200)
-      SAVE /PYPARS/
- 
-C...User process initialization commonblock.
-      INTEGER MAXPUP
-      PARAMETER (MAXPUP=100)
-      INTEGER IDBMUP,PDFGUP,PDFSUP,IDWTUP,NPRUP,LPRUP
-      DOUBLE PRECISION EBMUP,XSECUP,XERRUP,XMAXUP
-      COMMON/HEPRUP/IDBMUP(2),EBMUP(2),PDFGUP(2),PDFSUP(2),
-     &IDWTUP,NPRUP,XSECUP(MAXPUP),XERRUP(MAXPUP),XMAXUP(MAXPUP),
-     &LPRUP(MAXPUP)
-      SAVE /HEPRUP/
-
-C...Lines to read in assumed never longer than 200 characters. 
-      PARAMETER (MAXLEN=200)
-      CHARACTER*(MAXLEN) STRING
-
-C...Format for reading lines.
-      CHARACTER*6 STRFMT
-      STRFMT='(A000)'
-      WRITE(STRFMT(3:5),'(I3)') MAXLEN
-
-C...Loop until finds line beginning with "<init>" or "<init ". 
-  100 READ(MSTP(161),STRFMT,END=130,ERR=130) STRING
-      IBEG=0
-  110 IBEG=IBEG+1
-C...Allow indentation.
-      IF(STRING(IBEG:IBEG).EQ.' '.AND.IBEG.LT.MAXLEN-5) GOTO 110 
-      IF(STRING(IBEG:IBEG+5).NE.'<init>'.AND.
-     &STRING(IBEG:IBEG+5).NE.'<init ') GOTO 100
-
-C...Read first line of initialization info.
-      READ(MSTP(161),*,END=130,ERR=130) IDBMUP(1),IDBMUP(2),EBMUP(1),
-     &EBMUP(2),PDFGUP(1),PDFGUP(2),PDFSUP(1),PDFSUP(2),IDWTUP,NPRUP
-
-C...Read NPRUP subsequent lines with information on each process.
-      DO 120 IPR=1,NPRUP
-        READ(MSTP(161),*,END=130,ERR=130) XSECUP(IPR),XERRUP(IPR),
-     &  XMAXUP(IPR),LPRUP(IPR)
-  120 CONTINUE
-      RETURN
-
-C...Error exit: give up if initalization does not work.
-  130 WRITE(*,*) ' Failed to read LHEF initialization information.'
-      WRITE(*,*) ' Event generation will be stopped.'
-      CALL PYSTOP(12)
- 
-      RETURN
       END